Refactor part of the connection loop

client/src/main/java/BufferedSocket.java

@@ -204,7 +204,7 @@ public final class BufferedSocket implements Runnable {
 			}
 			if (this.aClass212_4.status == 1) {
 				try {
-					((Thread) this.aClass212_4.anObject6).join();
+					((Thread) this.aClass212_4.result).join();
 				} catch (@Pc(59) InterruptedException local59) {
 				}
 			}

client/src/main/java/Component.java

@@ -61,7 +61,7 @@ public final class Component {
 	public boolean aBoolean26;
 
 	@OriginalMember(owner = "client!be", name = "Z", descriptor = "I")
-	public int anInt463;
+	public int modelId;
 
 	@OriginalMember(owner = "client!be", name = "bb", descriptor = "[Ljava/lang/Object;")
 	public Object[] anObjectArray11;
@@ -103,13 +103,13 @@ public final class Component {
 	public int[] anIntArray39;
 
 	@OriginalMember(owner = "client!be", name = "dc", descriptor = "[I")
-	public int[] anIntArray40;
+	public int[] objTypes;
 
 	@OriginalMember(owner = "client!be", name = "fc", descriptor = "[Ljava/lang/Object;")
 	public Object[] anObjectArray20;
 
 	@OriginalMember(owner = "client!be", name = "lc", descriptor = "[Lclient!be;")
-	public Component[] aClass13Array3;
+	public Component[] createdComponents;
 
 	@OriginalMember(owner = "client!be", name = "mc", descriptor = "[B")
 	public byte[] aByteArray8;
@@ -175,7 +175,7 @@ public final class Component {
 	public Object[] anObjectArray30;
 
 	@OriginalMember(owner = "client!be", name = "wd", descriptor = "[I")
-	public int[] anIntArray50;
+	public int[] objCounts;
 
 	@OriginalMember(owner = "client!be", name = "H", descriptor = "Z")
 	public boolean aBoolean23 = false;
@@ -190,13 +190,13 @@ public final class Component {
 	public int anInt460 = 0;
 
 	@OriginalMember(owner = "client!be", name = "j", descriptor = "I")
-	public int anInt443 = 100;
+	public int modelZoom = 100;
 
 	@OriginalMember(owner = "client!be", name = "h", descriptor = "B")
-	public byte aByte2 = 0;
+	public byte xMode = 0;
 
 	@OriginalMember(owner = "client!be", name = "jb", descriptor = "I")
-	public int anInt469 = 0;
+	public int y = 0;
 
 	@OriginalMember(owner = "client!be", name = "nb", descriptor = "I")
 	public int anInt472 = 0;
@@ -208,7 +208,7 @@ public final class Component {
 	public short aShort10 = 3000;
 
 	@OriginalMember(owner = "client!be", name = "D", descriptor = "I")
-	public int anInt450 = 0;
+	public int modelXAngle = 0;
 
 	@OriginalMember(owner = "client!be", name = "Eb", descriptor = "I")
 	public int anInt481 = 0;
@@ -223,7 +223,7 @@ public final class Component {
 	public int anInt447 = 0;
 
 	@OriginalMember(owner = "client!be", name = "hb", descriptor = "I")
-	public int anInt468 = 0;
+	public int scrollY = 0;
 
 	@OriginalMember(owner = "client!be", name = "xb", descriptor = "I")
 	public int anInt477 = -1;
@@ -232,7 +232,7 @@ public final class Component {
 	public int anInt467 = 0;
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "Z")
-	public boolean aBoolean17 = false;
+	public boolean hidden = false;
 
 	@OriginalMember(owner = "client!be", name = "Zb", descriptor = "I")
 	public int anInt490 = 1;
@@ -241,7 +241,7 @@ public final class Component {
 	public int anInt484 = -1;
 
 	@OriginalMember(owner = "client!be", name = "O", descriptor = "I")
-	public int anInt457 = -1;
+	public int componentId = -1;
 
 	@OriginalMember(owner = "client!be", name = "J", descriptor = "Z")
 	public boolean aBoolean24 = false;
@@ -310,19 +310,19 @@ public final class Component {
 	private int anInt461 = -1;
 
 	@OriginalMember(owner = "client!be", name = "N", descriptor = "I")
-	public int anInt456 = -1;
+	public int layer = -1;
 
 	@OriginalMember(owner = "client!be", name = "pb", descriptor = "I")
 	public int anInt473 = 1;
 
 	@OriginalMember(owner = "client!be", name = "Q", descriptor = "I")
-	public int anInt458 = -1;
+	public int objId = -1;
 
 	@OriginalMember(owner = "client!be", name = "vb", descriptor = "I")
 	public int anInt475 = 0;
 
 	@OriginalMember(owner = "client!be", name = "nc", descriptor = "I")
-	public int anInt497 = 0;
+	public int modelZOffset = 0;
 
 	@OriginalMember(owner = "client!be", name = "Dc", descriptor = "Lclient!na;")
 	public JagString aClass100_88 = Static176.aClass100_800;
@@ -331,7 +331,7 @@ public final class Component {
 	public int anInt511 = 0;
 
 	@OriginalMember(owner = "client!be", name = "w", descriptor = "I")
-	public int anInt446 = 0;
+	public int baseWidth = 0;
 
 	@OriginalMember(owner = "client!be", name = "Mc", descriptor = "I")
 	public int anInt512 = 0;
@@ -349,13 +349,13 @@ public final class Component {
 	public int anInt476 = 0;
 
 	@OriginalMember(owner = "client!be", name = "hc", descriptor = "I")
-	public int anInt494 = 0;
+	public int modelXOffset = 0;
 
 	@OriginalMember(owner = "client!be", name = "Ub", descriptor = "Lclient!na;")
 	public JagString aClass100_86 = Static176.aClass100_800;
 
 	@OriginalMember(owner = "client!be", name = "Lb", descriptor = "I")
-	public int anInt483 = 0;
+	public int modelRotationSpeed = 0;
 
 	@OriginalMember(owner = "client!be", name = "r", descriptor = "Lclient!na;")
 	public JagString aClass100_82 = Static176.aClass100_800;
@@ -385,7 +385,7 @@ public final class Component {
 	public int anInt519 = -1;
 
 	@OriginalMember(owner = "client!be", name = "zc", descriptor = "B")
-	public byte aByte4 = 0;
+	public byte yMode = 0;
 
 	@OriginalMember(owner = "client!be", name = "qc", descriptor = "I")
 	public int anInt500 = 0;
@@ -412,10 +412,10 @@ public final class Component {
 	public JagString aClass100_89 = LocalizedText.OK;
 
 	@OriginalMember(owner = "client!be", name = "Gc", descriptor = "I")
-	public int anInt508 = 0;
+	public int modelYOffset = 0;
 
 	@OriginalMember(owner = "client!be", name = "vc", descriptor = "I")
-	public int anInt503 = 0;
+	public int objCount = 0;
 
 	@OriginalMember(owner = "client!be", name = "Uc", descriptor = "I")
 	public int anInt517 = -1;
@@ -433,7 +433,7 @@ public final class Component {
 	public int anInt525 = 0;
 
 	@OriginalMember(owner = "client!be", name = "ab", descriptor = "I")
-	public int anInt464 = 1;
+	public int modelType = 1;
 
 	@OriginalMember(owner = "client!be", name = "md", descriptor = "Z")
 	public boolean aBoolean34 = false;
@@ -448,19 +448,19 @@ public final class Component {
 	public int anInt526 = 0;
 
 	@OriginalMember(owner = "client!be", name = "ld", descriptor = "I")
-	public int anInt524 = 0;
+	public int modelYAngle = 0;
 
 	@OriginalMember(owner = "client!be", name = "T", descriptor = "Z")
 	public boolean aBoolean25 = false;
 
 	@OriginalMember(owner = "client!be", name = "vd", descriptor = "I")
-	public int anInt529 = 0;
+	public int baseX = 0;
 
 	@OriginalMember(owner = "client!be", name = "jd", descriptor = "I")
-	public int anInt523 = 0;
+	public int x = 0;
 
 	@OriginalMember(owner = "client!be", name = "l", descriptor = "I")
-	public int anInt444 = 0;
+	public int baseY = 0;
 
 	@OriginalMember(owner = "client!be", name = "Bb", descriptor = "Z")
 	public boolean aBoolean31 = true;
@@ -549,20 +549,20 @@ public final class Component {
 		this.anInt452 = arg0.g1();
 		this.anInt530 = arg0.g1();
 		this.anInt453 = arg0.g2();
-		this.anInt529 = arg0.g2s();
+		this.baseX = arg0.g2s();
-		this.anInt444 = arg0.g2s();
+		this.baseY = arg0.g2s();
-		this.anInt446 = arg0.g2();
+		this.baseWidth = arg0.g2();
 		this.anInt488 = arg0.g2();
 		this.aByte5 = 0;
 		this.aByte3 = 0;
-		this.aByte4 = 0;
+		this.yMode = 0;
-		this.aByte2 = 0;
+		this.xMode = 0;
 		this.anInt476 = arg0.g1();
-		this.anInt456 = arg0.g2();
+		this.layer = arg0.g2();
-		if (this.anInt456 == 65535) {
+		if (this.layer == 65535) {
-			this.anInt456 = -1;
+			this.layer = -1;
 		} else {
-			this.anInt456 += this.anInt507 & 0xFFFF0000;
+			this.layer += this.anInt507 & 0xFFFF0000;
 		}
 		this.anInt470 = arg0.g2();
 		if (this.anInt470 == 65535) {
@@ -597,7 +597,7 @@ public final class Component {
 		}
 		if (this.anInt452 == 0) {
 			this.anInt491 = arg0.g2();
-			this.aBoolean17 = arg0.g1() == 1;
+			this.hidden = arg0.g1() == 1;
 		}
 		if (this.anInt452 == 1) {
 			arg0.g2();
@@ -606,8 +606,8 @@ public final class Component {
 		local164 = 0;
 		if (this.anInt452 == 2) {
 			this.aByte3 = 3;
-			this.anIntArray50 = new int[this.anInt446 * this.anInt488];
+			this.objCounts = new int[this.baseWidth * this.anInt488];
-			this.anIntArray40 = new int[this.anInt488 * this.anInt446];
+			this.objTypes = new int[this.anInt488 * this.baseWidth];
 			this.aByte5 = 3;
 			local175 = arg0.g1();
 			local183 = arg0.g1();
@@ -680,11 +680,11 @@ public final class Component {
 			this.anInt519 = arg0.g4();
 		}
 		if (this.anInt452 == 6) {
-			this.anInt464 = 1;
+			this.modelType = 1;
-			this.anInt463 = arg0.g2();
+			this.modelId = arg0.g2();
 			this.anInt518 = 1;
-			if (this.anInt463 == 65535) {
+			if (this.modelId == 65535) {
-				this.anInt463 = -1;
+				this.modelId = -1;
 			}
 			this.anInt461 = arg0.g2();
 			if (this.anInt461 == 65535) {
@@ -698,15 +698,15 @@ public final class Component {
 			if (this.anInt462 == 65535) {
 				this.anInt462 = -1;
 			}
-			this.anInt443 = arg0.g2();
+			this.modelZoom = arg0.g2();
-			this.anInt450 = arg0.g2();
+			this.modelXAngle = arg0.g2();
-			this.anInt524 = arg0.g2();
+			this.modelYAngle = arg0.g2();
 		}
 		if (this.anInt452 == 7) {
 			this.aByte3 = 3;
 			this.aByte5 = 3;
-			this.anIntArray50 = new int[this.anInt488 * this.anInt446];
+			this.objCounts = new int[this.anInt488 * this.baseWidth];
-			this.anIntArray40 = new int[this.anInt446 * this.anInt488];
+			this.objTypes = new int[this.baseWidth * this.anInt488];
 			this.anInt460 = arg0.g1();
 			this.anInt502 = arg0.g2();
 			if (this.anInt502 == 65535) {
@@ -820,13 +820,13 @@ public final class Component {
 	}
 
 	@OriginalMember(owner = "client!be", name = "b", descriptor = "(III)V")
-	public final void method487(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final void swapObjs(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(8) int local8 = this.anIntArray40[arg1];
+		@Pc(8) int local8 = this.objTypes[arg1];
-		this.anIntArray40[arg1] = this.anIntArray40[arg0];
+		this.objTypes[arg1] = this.objTypes[arg0];
-		this.anIntArray40[arg0] = local8;
+		this.objTypes[arg0] = local8;
-		@Pc(34) int local34 = this.anIntArray50[arg1];
+		@Pc(34) int local34 = this.objCounts[arg1];
-		this.anIntArray50[arg1] = this.anIntArray50[arg0];
+		this.objCounts[arg1] = this.objCounts[arg0];
-		this.anIntArray50[arg0] = local34;
+		this.objCounts[arg0] = local34;
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;")
@@ -838,8 +838,8 @@ public final class Component {
 			local10 = this.anInt518;
 			local13 = this.anInt461;
 		} else {
-			local13 = this.anInt463;
+			local13 = this.modelId;
-			local10 = this.anInt464;
+			local10 = this.modelType;
 		}
 		if (local10 == 0) {
 			return null;
@@ -903,8 +903,8 @@ public final class Component {
 			} else if (arg5 == null) {
 				return null;
 			} else {
-				@Pc(227) int local227 = this.anInt463 >>> 16;
+				@Pc(227) int local227 = this.modelId >>> 16;
-				@Pc(232) int local232 = this.anInt463 & 0xFFFF;
+				@Pc(232) int local232 = this.modelId & 0xFFFF;
 				@Pc(235) int local235 = this.anInt498;
 				@Pc(246) Model local246 = arg5.method1946(arg0, local235, local227, arg3, arg1, arg2, local232);
 				if (local246 == null) {
@@ -983,21 +983,21 @@ public final class Component {
 			arg0.gjstr();
 		}
 		this.anInt453 = arg0.g2();
-		this.anInt529 = arg0.g2s();
+		this.baseX = arg0.g2s();
-		this.anInt444 = arg0.g2s();
+		this.baseY = arg0.g2s();
-		this.anInt446 = arg0.g2();
+		this.baseWidth = arg0.g2();
 		this.anInt488 = arg0.g2();
 		this.aByte5 = arg0.g1s();
 		this.aByte3 = arg0.g1s();
-		this.aByte4 = arg0.g1s();
+		this.yMode = arg0.g1s();
-		this.aByte2 = arg0.g1s();
+		this.xMode = arg0.g1s();
-		this.anInt456 = arg0.g2();
+		this.layer = arg0.g2();
-		if (this.anInt456 == 65535) {
+		if (this.layer == 65535) {
-			this.anInt456 = -1;
+			this.layer = -1;
 		} else {
-			this.anInt456 = (this.anInt507 & 0xFFFF0000) + this.anInt456;
+			this.layer = (this.anInt507 & 0xFFFF0000) + this.layer;
 		}
-		this.aBoolean17 = arg0.g1() == 1;
+		this.hidden = arg0.g1() == 1;
 		if (this.anInt452 == 0) {
 			this.anInt486 = arg0.g2();
 			this.anInt491 = arg0.g2();
@@ -1017,17 +1017,17 @@ public final class Component {
 			this.aBoolean26 = arg0.g1() == 1;
 		}
 		if (this.anInt452 == 6) {
-			this.anInt464 = 1;
+			this.modelType = 1;
-			this.anInt463 = arg0.g2();
+			this.modelId = arg0.g2();
-			if (this.anInt463 == 65535) {
+			if (this.modelId == 65535) {
-				this.anInt463 = -1;
+				this.modelId = -1;
 			}
 			this.anInt495 = arg0.g2s();
 			this.anInt481 = arg0.g2s();
-			this.anInt450 = arg0.g2();
+			this.modelXAngle = arg0.g2();
-			this.anInt524 = arg0.g2();
+			this.modelYAngle = arg0.g2();
-			this.anInt508 = arg0.g2();
+			this.modelYOffset = arg0.g2();
-			this.anInt443 = arg0.g2();
+			this.modelZoom = arg0.g2();
 			this.anInt522 = arg0.g2();
 			if (this.anInt522 == 65535) {
 				this.anInt522 = -1;

client/src/main/java/DelayedStateChange.java

@@ -6,16 +6,16 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class DelayedStateChange extends SecondaryNode {
 
 	@OriginalMember(owner = "client!da", name = "T", descriptor = "I")
-	public int anInt1269;
+	public int intArg2;
 
 	@OriginalMember(owner = "client!da", name = "U", descriptor = "I")
-	public int anInt1270;
+	public int intArg3;
 
 	@OriginalMember(owner = "client!da", name = "V", descriptor = "I")
-	public int anInt1271;
+	public int intArg1;
 
 	@OriginalMember(owner = "client!da", name = "W", descriptor = "Lclient!na;")
-	public JagString aClass100_254;
+	public JagString stringArg;
 
 	@OriginalMember(owner = "client!da", name = "<init>", descriptor = "(II)V")
 	public DelayedStateChange(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {

client/src/main/java/GameShell.java

@@ -109,7 +109,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		Static154.canvas.requestFocus();
 		Static233.aBoolean253 = true;
 		Static69.aBoolean115 = true;
-		Static26.aBoolean59 = true;
+		Static26.focus = true;
 		Static35.aBoolean66 = false;
 		Static243.aLong178 = MonotonicClock.currentTimeMillis();
 	}
@@ -230,7 +230,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		Static228.aLongArray8[Static261.anInt5741] = local6;
 		Static261.anInt5741 = Static261.anInt5741 + 1 & 0x1F;
 		synchronized (this) {
-			Static26.aBoolean59 = Static233.aBoolean253;
+			Static26.focus = Static233.aBoolean253;
 		}
 		this.method921();
 		if (local10 != 0L && local6 <= local10) {
@@ -386,7 +386,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			while (local76.status == 0) {
 				Static231.method3983(10L);
 			}
-			Static37.aThread1 = (Thread) local76.anObject6;
+			Static37.aThread1 = (Thread) local76.result;
 		} catch (@Pc(91) Exception local91) {
 			Static89.method1839(null, local91);
 		}
@@ -438,7 +438,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			while (local86.status == 0) {
 				Static231.method3983(10L);
 			}
-			Static37.aThread1 = (Thread) local86.anObject6;
+			Static37.aThread1 = (Thread) local86.result;
 		} catch (@Pc(103) Exception local103) {
 			Static89.method1839(null, local103);
 			this.method927("crash");

client/src/main/java/HookRequest.java

@@ -32,5 +32,5 @@ public final class HookRequest extends Node {
 	public Object[] anObjectArray31;
 
 	@OriginalMember(owner = "client!jl", name = "F", descriptor = "Lclient!be;")
-	public Component aClass13_17;
+	public Component source;
 }

client/src/main/java/Js5CacheQueue.java

@@ -27,7 +27,7 @@ public final class Js5CacheQueue implements Runnable {
 		if (local20.status == 2) {
 			throw new RuntimeException();
 		}
-		this.aThread2 = (Thread) local20.anObject6;
+		this.aThread2 = (Thread) local20.result;
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!c;I)V")

client/src/main/java/MouseRecorder.java

@@ -9,27 +9,27 @@ public final class MouseRecorder implements Runnable {
 	public boolean aBoolean151 = true;
 
 	@OriginalMember(owner = "client!jd", name = "f", descriptor = "Ljava/lang/Object;")
-	public final Object anObject4 = new Object();
+	public final Object lock = new Object();
 
 	@OriginalMember(owner = "client!jd", name = "k", descriptor = "I")
-	public int anInt2990 = 0;
+	public int samples = 0;
 
 	@OriginalMember(owner = "client!jd", name = "l", descriptor = "[I")
-	public final int[] anIntArray279 = new int[500];
+	public final int[] y = new int[500];
 
 	@OriginalMember(owner = "client!jd", name = "n", descriptor = "[I")
-	public final int[] anIntArray280 = new int[500];
+	public final int[] x = new int[500];
 
 	@OriginalMember(owner = "client!jd", name = "run", descriptor = "()V")
 	@Override
 	public final void run() {
 		while (this.aBoolean151) {
-			@Pc(12) Object local12 = this.anObject4;
+			@Pc(12) Object local12 = this.lock;
-			synchronized (this.anObject4) {
+			synchronized (this.lock) {
-				if (this.anInt2990 < 500) {
+				if (this.samples < 500) {
-					this.anIntArray280[this.anInt2990] = Static215.anInt4873;
+					this.x[this.samples] = Static215.anInt4873;
-					this.anIntArray279[this.anInt2990] = Static223.anInt5032;
+					this.y[this.samples] = Static223.anInt5032;
-					this.anInt2990++;
+					this.samples++;
 				}
 			}
 			Static231.method3983(50L);

client/src/main/java/Packet.java

@@ -59,7 +59,7 @@ public final class Packet extends Buffer {
 	}
 
 	@OriginalMember(owner = "client!i", name = "r", descriptor = "(II)V")
-	public final void method2242(@OriginalArg(1) int arg0) {
+	public final void p1isaac(@OriginalArg(1) int arg0) {
 		this.data[this.offset++] = (byte) (arg0 + this.aClass71_1.method2295());
 	}
 

client/src/main/java/PathingEntity.java

@@ -79,7 +79,7 @@ public abstract class PathingEntity extends Entity {
 	public int anInt3431;
 
 	@OriginalMember(owner = "client!fe", name = "w", descriptor = "[I")
-	public final int[] anIntArray317 = new int[10];
+	public final int[] movementQueueZ = new int[10];
 
 	@OriginalMember(owner = "client!fe", name = "z", descriptor = "I")
 	public int anInt3358 = 0;
@@ -91,7 +91,7 @@ public abstract class PathingEntity extends Entity {
 	public final int[] anIntArray319 = new int[4];
 
 	@OriginalMember(owner = "client!fe", name = "K", descriptor = "[I")
-	public final int[] anIntArray318 = new int[10];
+	public final int[] movementQueueX = new int[10];
 
 	@OriginalMember(owner = "client!fe", name = "B", descriptor = "I")
 	public int anInt3360 = 0;
@@ -269,39 +269,39 @@ public abstract class PathingEntity extends Entity {
 			this.anInt3369 = -1;
 		}
 		if (!arg3) {
-			@Pc(32) int local32 = arg1 - this.anIntArray318[0];
+			@Pc(32) int local32 = arg1 - this.movementQueueX[0];
-			@Pc(40) int local40 = arg2 - this.anIntArray317[0];
+			@Pc(40) int local40 = arg2 - this.movementQueueZ[0];
 			if (local32 >= -8 && local32 <= 8 && local40 >= -8 && local40 <= 8) {
 				if (this.anInt3409 < 9) {
 					this.anInt3409++;
 				}
 				for (@Pc(72) int local72 = this.anInt3409; local72 > 0; local72--) {
-					this.anIntArray318[local72] = this.anIntArray318[local72 - 1];
+					this.movementQueueX[local72] = this.movementQueueX[local72 - 1];
-					this.anIntArray317[local72] = this.anIntArray317[local72 - 1];
+					this.movementQueueZ[local72] = this.movementQueueZ[local72 - 1];
 					this.aByteArray48[local72] = this.aByteArray48[local72 - 1];
 				}
 				this.aByteArray48[0] = 1;
-				this.anIntArray318[0] = arg1;
+				this.movementQueueX[0] = arg1;
-				this.anIntArray317[0] = arg2;
+				this.movementQueueZ[0] = arg2;
 				return;
 			}
 		}
 		this.anInt3417 = 0;
-		this.anIntArray318[0] = arg1;
+		this.movementQueueX[0] = arg1;
-		this.anIntArray317[0] = arg2;
+		this.movementQueueZ[0] = arg2;
 		this.anInt3409 = 0;
 		this.anInt3405 = 0;
-		this.anInt3421 = arg0 * 64 + this.anIntArray317[0] * 128;
+		this.anInt3421 = arg0 * 64 + this.movementQueueZ[0] * 128;
-		this.anInt3412 = arg0 * 64 + this.anIntArray318[0] * 128;
+		this.anInt3412 = arg0 * 64 + this.movementQueueX[0] * 128;
-		if (Static239.aBoolean269 && Static173.aClass8_Sub4_Sub1_2 == this) {
+		if (Static239.aBoolean269 && Static173.self == this) {
 			Static86.method1799();
 		}
 	}
 
 	@OriginalMember(owner = "client!fe", name = "a", descriptor = "(IBI)V")
 	public final void method2684(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(10) int local10 = this.anIntArray318[0];
+		@Pc(10) int local10 = this.movementQueueX[0];
-		@Pc(15) int local15 = this.anIntArray317[0];
+		@Pc(15) int local15 = this.movementQueueZ[0];
 		if (arg1 == 0) {
 			local10--;
 			local15++;
@@ -313,8 +313,8 @@ public abstract class PathingEntity extends Entity {
 			this.anInt3409++;
 		}
 		for (@Pc(50) int local50 = this.anInt3409; local50 > 0; local50--) {
-			this.anIntArray318[local50] = this.anIntArray318[local50 - 1];
+			this.movementQueueX[local50] = this.movementQueueX[local50 - 1];
-			this.anIntArray317[local50] = this.anIntArray317[local50 - 1];
+			this.movementQueueZ[local50] = this.movementQueueZ[local50 - 1];
 			this.aByteArray48[local50] = this.aByteArray48[local50 - 1];
 		}
 		if (arg1 == 1) {
@@ -342,8 +342,8 @@ public abstract class PathingEntity extends Entity {
 			local15--;
 			local10++;
 		}
-		this.anIntArray318[0] = local10;
+		this.movementQueueX[0] = local10;
-		this.anIntArray317[0] = local15;
+		this.movementQueueZ[0] = local15;
 	}
 
 	@OriginalMember(owner = "client!fe", name = "a", descriptor = "(BLclient!ak;I)V")
@@ -363,13 +363,13 @@ public abstract class PathingEntity extends Entity {
 		@Pc(53) int local53 = -local27 / 2;
 		@Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16;
 		@Pc(75) int local75 = local39 * local53 + local43 * local48 >> 16;
-		@Pc(87) int local87 = Static207.method3685(Static55.anInt1735, local75 + this.anInt3412, this.anInt3421 + local64);
+		@Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.anInt3412, this.anInt3421 + local64);
 		@Pc(91) int local91 = local24 / 2;
 		@Pc(96) int local96 = -local27 / 2;
 		@Pc(106) int local106 = local91 * local43 + local96 * local39 >> 16;
 		@Pc(110) int local110 = local27 / 2;
 		@Pc(121) int local121 = local96 * local43 - local91 * local39 >> 16;
-		@Pc(134) int local134 = Static207.method3685(Static55.anInt1735, local106 + this.anInt3412, this.anInt3421 - -local121);
+		@Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.anInt3412, this.anInt3421 - -local121);
 		@Pc(139) int local139 = -local24 / 2;
 		@Pc(150) int local150 = local110 * local43 - local39 * local139 >> 16;
 		@Pc(154) int local154 = local27 / 2;
@@ -377,9 +377,9 @@ public abstract class PathingEntity extends Entity {
 		@Pc(169) int local169 = local39 * local110 + local43 * local139 >> 16;
 		@Pc(179) int local179 = local154 * local43 - local39 * local158 >> 16;
 		@Pc(189) int local189 = local39 * local154 + local43 * local158 >> 16;
-		@Pc(201) int local201 = Static207.method3685(Static55.anInt1735, this.anInt3412 + local169, local150 + this.anInt3421);
+		@Pc(201) int local201 = Static207.method3685(Static55.level, this.anInt3412 + local169, local150 + this.anInt3421);
 		@Pc(212) int local212 = local134 > local87 ? local87 : local134;
-		@Pc(224) int local224 = Static207.method3685(Static55.anInt1735, local189 + this.anInt3412, local179 + this.anInt3421);
+		@Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.anInt3412, local179 + this.anInt3421);
 		@Pc(231) int local231 = local224 > local201 ? local201 : local224;
 		@Pc(238) int local238 = local224 > local134 ? local134 : local224;
 		@Pc(245) int local245 = local201 <= local87 ? local201 : local87;

client/src/main/java/Player.java

@@ -157,8 +157,8 @@ public final class Player extends PathingEntity {
 		local175 = this.aClass59_1.anInt2492;
 		this.aClass59_1.method1950(local197, local22, local26 == 1, local44, this.anInt3365);
 		if (local175 != local22) {
-			this.anInt3412 = this.anIntArray318[0] * 128 + this.method2693() * 64;
+			this.anInt3412 = this.movementQueueX[0] * 128 + this.method2693() * 64;
-			this.anInt3421 = this.anIntArray317[0] * 128 + this.method2693() * 64;
+			this.anInt3421 = this.movementQueueZ[0] * 128 + this.method2693() * 64;
 		}
 		if (this.aClass47_Sub1_5 != null) {
 			this.aClass47_Sub1_5.method1646();
@@ -209,7 +209,7 @@ public final class Player extends PathingEntity {
 				local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null);
 			}
 		}
-		if (Static173.aClass8_Sub4_Sub1_2 == this) {
+		if (Static173.self == this) {
 			for (local102 = Static143.aClass102Array1.length - 1; local102 >= 0; local102--) {
 				@Pc(245) Class102 local245 = Static143.aClass102Array1[local102];
 				if (local245 != null && local245.anInt4052 != -1) {
@@ -218,21 +218,21 @@ public final class Player extends PathingEntity {
 					if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.aClass8_Sub4_Sub2Array1.length > local245.anInt4057) {
 						@Pc(278) Npc local278 = Static175.aClass8_Sub4_Sub2Array1[local245.anInt4057];
 						if (local278 != null) {
-							local291 = local278.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32;
+							local291 = local278.anInt3412 / 32 - Static173.self.anInt3412 / 32;
-							local302 = local278.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32;
+							local302 = local278.anInt3421 / 32 - Static173.self.anInt3421 / 32;
 							this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
 						}
 					}
 					if (local245.anInt4058 == 2) {
-						@Pc(340) int local340 = (local245.anInt4053 - Static225.anInt5068) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32;
+						@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32;
-						local291 = (local245.anInt4046 - Static142.anInt3483) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32;
+						local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32;
 						this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
 					}
 					if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.aClass8_Sub4_Sub1Array1.length > local245.anInt4057) {
 						@Pc(395) Player local395 = Static159.aClass8_Sub4_Sub1Array1[local245.anInt4057];
 						if (local395 != null) {
-							local291 = local395.anInt3412 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32;
+							local291 = local395.anInt3412 / 32 - Static173.self.anInt3412 / 32;
-							local302 = local395.anInt3421 / 32 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32;
+							local302 = local395.anInt3421 / 32 - Static173.self.anInt3421 / 32;
 							this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
 						}
 					}

client/src/main/java/Static10.java

@@ -26,9 +26,9 @@ public final class Static10 {
 
 	@OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I")
 	public static int method347(@OriginalArg(1) int arg0) {
-		if (Static124.aClass95_2 != null) {
+		if (Static124.socket != null) {
-			Static124.aClass95_2.method2834();
+			Static124.socket.method2834();
-			Static124.aClass95_2 = null;
+			Static124.socket = null;
 		}
 		Static127.anInt3132++;
 		if (Static127.anInt3132 > 4) {
@@ -72,14 +72,14 @@ public final class Static10 {
 	}
 
 	@OriginalMember(owner = "client!an", name = "h", descriptor = "(I)Z")
-	public static boolean method349() {
+	public static boolean readPacket() {
 		try {
 			return Static4.method26();
 		} catch (@Pc(14) IOException local14) {
 			Static175.method3279();
 			return true;
 		} catch (@Pc(19) Exception local19) {
-			@Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.anInt5068 + Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]) + "," + (Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] + Static142.anInt3483) + " - ";
+			@Pc(61) String local61 = "T2 - " + Static164.anInt3985 + "," + Static5.anInt45 + "," + Static49.anInt1462 + " - " + Static223.anInt5028 + "," + (Static225.originX + Static173.self.movementQueueX[0]) + "," + (Static173.self.movementQueueZ[0] + Static142.originZ) + " - ";
 			for (@Pc(63) int local63 = 0; local63 < Static223.anInt5028 && local63 < 50; local63++) {
 				local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ",";
 			}

client/src/main/java/Static102.java

@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static102 {
 
 	@OriginalMember(owner = "client!hn", name = "Z", descriptor = "I")
-	public static int anInt2681;
+	public static int keyCode;
 
 	@OriginalMember(owner = "client!hn", name = "K", descriptor = "Ljava/util/Calendar;")
 	public static final Calendar aCalendar2 = Calendar.getInstance();
@@ -65,12 +65,12 @@ public final class Static102 {
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(IIIZIIIIIIII)Z")
 	public static boolean method2075(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) {
-		if (Static173.aClass8_Sub4_Sub1_2.method2693() == 2) {
+		if (Static173.self.method2693() == 2) {
 			return Static2.method8(arg6, arg7, arg4, arg0, arg9, arg3, arg2, arg1, arg5, arg8, arg10);
-		} else if (Static173.aClass8_Sub4_Sub1_2.method2693() <= 2) {
+		} else if (Static173.self.method2693() <= 2) {
 			return Static45.method1171(arg5, arg4, arg10, arg9, arg8, arg2, arg1, arg3, arg7, arg0, arg6);
 		} else {
-			return Static96.method1955(arg9, arg6, arg8, arg1, Static173.aClass8_Sub4_Sub1_2.method2693(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
+			return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.method2693(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
 		}
 	}
 }

client/src/main/java/Static104.java

@@ -28,8 +28,8 @@ public final class Static104 {
 		}
 		@Pc(79) int local79 = arg0.anInt3412;
 		@Pc(82) int local82 = arg0.anInt3421;
-		@Pc(99) int local99 = arg0.anIntArray318[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
+		@Pc(99) int local99 = arg0.movementQueueX[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
-		@Pc(116) int local116 = arg0.anIntArray317[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
+		@Pc(116) int local116 = arg0.movementQueueZ[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
 		if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) {
 			arg0.anInt3412 = local99;
 			arg0.anInt3421 = local116;

client/src/main/java/Static109.java

@@ -33,21 +33,21 @@ public final class Static109 {
 			return;
 		}
 		Static202.aClass153_84.method4490(arg0);
-		if (Static241.aClass13ArrayArray12[arg0] == null) {
+		if (Static241.components[arg0] == null) {
 			return;
 		}
 		@Pc(27) boolean local27 = true;
-		for (@Pc(29) int local29 = 0; local29 < Static241.aClass13ArrayArray12[arg0].length; local29++) {
+		for (@Pc(29) int local29 = 0; local29 < Static241.components[arg0].length; local29++) {
-			if (Static241.aClass13ArrayArray12[arg0][local29] != null) {
+			if (Static241.components[arg0][local29] != null) {
-				if (Static241.aClass13ArrayArray12[arg0][local29].anInt452 == 2) {
+				if (Static241.components[arg0][local29].anInt452 == 2) {
 					local27 = false;
 				} else {
-					Static241.aClass13ArrayArray12[arg0][local29] = null;
+					Static241.components[arg0][local29] = null;
 				}
 			}
 		}
 		if (local27) {
-			Static241.aClass13ArrayArray12[arg0] = null;
+			Static241.components[arg0] = null;
 		}
 		Static223.aBooleanArray115[arg0] = false;
 	}

client/src/main/java/Static111.java

@@ -24,44 +24,44 @@ public final class Static111 {
 
 	@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
 	public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		if (arg0.aByte2 == 0) {
+		if (arg0.xMode == 0) {
-			arg0.anInt469 = arg0.anInt444;
+			arg0.y = arg0.baseY;
-		} else if (arg0.aByte2 == 1) {
+		} else if (arg0.xMode == 1) {
-			arg0.anInt469 = (arg1 - arg0.anInt459) / 2 + arg0.anInt444;
+			arg0.y = (arg1 - arg0.anInt459) / 2 + arg0.baseY;
-		} else if (arg0.aByte2 == 2) {
+		} else if (arg0.xMode == 2) {
-			arg0.anInt469 = arg1 - arg0.anInt459 - arg0.anInt444;
+			arg0.y = arg1 - arg0.anInt459 - arg0.baseY;
-		} else if (arg0.aByte2 == 3) {
+		} else if (arg0.xMode == 3) {
-			arg0.anInt469 = arg0.anInt444 * arg1 >> 14;
+			arg0.y = arg0.baseY * arg1 >> 14;
-		} else if (arg0.aByte2 == 4) {
+		} else if (arg0.xMode == 4) {
-			arg0.anInt469 = (arg1 * arg0.anInt444 >> 14) + (arg1 - arg0.anInt459) / 2;
+			arg0.y = (arg1 * arg0.baseY >> 14) + (arg1 - arg0.anInt459) / 2;
 		} else {
-			arg0.anInt469 = arg1 - (arg1 * arg0.anInt444 >> 14) - arg0.anInt459;
+			arg0.y = arg1 - (arg1 * arg0.baseY >> 14) - arg0.anInt459;
 		}
-		if (arg0.aByte4 == 0) {
+		if (arg0.yMode == 0) {
-			arg0.anInt523 = arg0.anInt529;
+			arg0.x = arg0.baseX;
-		} else if (arg0.aByte4 == 1) {
+		} else if (arg0.yMode == 1) {
-			arg0.anInt523 = arg0.anInt529 + (arg2 - arg0.anInt445) / 2;
+			arg0.x = arg0.baseX + (arg2 - arg0.anInt445) / 2;
-		} else if (arg0.aByte4 == 2) {
+		} else if (arg0.yMode == 2) {
-			arg0.anInt523 = arg2 - arg0.anInt529 - arg0.anInt445;
+			arg0.x = arg2 - arg0.baseX - arg0.anInt445;
-		} else if (arg0.aByte4 == 3) {
+		} else if (arg0.yMode == 3) {
-			arg0.anInt523 = arg0.anInt529 * arg2 >> 14;
+			arg0.x = arg0.baseX * arg2 >> 14;
-		} else if (arg0.aByte4 == 4) {
+		} else if (arg0.yMode == 4) {
-			arg0.anInt523 = (arg0.anInt529 * arg2 >> 14) + (arg2 - arg0.anInt445) / 2;
+			arg0.x = (arg0.baseX * arg2 >> 14) + (arg2 - arg0.anInt445) / 2;
 		} else {
-			arg0.anInt523 = arg2 - (arg2 * arg0.anInt529 >> 14) - arg0.anInt445;
+			arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.anInt445;
 		}
 		if (!Static121.aBoolean154 || Static36.method940(arg0).anInt546 == 0 && arg0.anInt452 != 0) {
 			return;
 		}
-		if (arg0.anInt469 < 0) {
+		if (arg0.y < 0) {
-			arg0.anInt469 = 0;
+			arg0.y = 0;
-		} else if (arg0.anInt459 + arg0.anInt469 > arg1) {
+		} else if (arg0.anInt459 + arg0.y > arg1) {
-			arg0.anInt469 = arg1 - arg0.anInt459;
+			arg0.y = arg1 - arg0.anInt459;
 		}
-		if (arg0.anInt523 < 0) {
+		if (arg0.x < 0) {
-			arg0.anInt523 = 0;
+			arg0.x = 0;
-		} else if (arg2 < arg0.anInt523 + arg0.anInt445) {
+		} else if (arg2 < arg0.x + arg0.anInt445) {
-			arg0.anInt523 = arg2 - arg0.anInt445;
+			arg0.x = arg2 - arg0.anInt445;
 		}
 	}
 
@@ -72,11 +72,11 @@ public final class Static111 {
 			Static22.anInt723 = Static57.anInt1759;
 			Static215.anInt4873 = Static147.anInt3521;
 			Static223.anInt5032 = Static165.anInt4039;
-			Static150.anInt3585 = Static41.anInt1313;
+			Static150.clickButton = Static41.anInt1313;
-			Static7.anInt985 = Static34.anInt1034;
+			Static7.clickX = Static34.anInt1034;
 			Static93.anInt2467++;
-			Static60.anInt1893 = Static222.anInt4973;
+			Static60.clickY = Static222.anInt4973;
-			Static133.aLong175 = Static209.aLong161;
+			Static133.clickTime = Static209.aLong161;
 			Static41.anInt1313 = 0;
 		}
 	}

client/src/main/java/Static115.java

@@ -56,11 +56,11 @@ public final class Static115 {
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
 	public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		if (Static70.anInt2013 == 1) {
+		if (Static70.type == 1) {
-			Static240.aClass3_Sub2_Sub1Array10[Static17.anInt577 / 100].method1423(Static122.anInt3047 - 8, Static25.anInt826 + -8);
+			Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100].method1423(Static122.x - 8, Static25.y + -8);
 		}
-		if (Static70.anInt2013 == 2) {
+		if (Static70.type == 2) {
-			Static240.aClass3_Sub2_Sub1Array10[Static17.anInt577 / 100 + 4].method1423(Static122.anInt3047 - 8, Static25.anInt826 + -8);
+			Static240.aClass3_Sub2_Sub1Array10[Static17.milliseconds / 100 + 4].method1423(Static122.x - 8, Static25.y + -8);
 		}
 		Static256.method4392();
 	}

client/src/main/java/Static116.java

@@ -32,7 +32,7 @@ public final class Static116 {
 	public static void method2325(@OriginalArg(1) boolean arg0) {
 		Static90.aByteArrayArrayArray8 = null;
 		Static83.anIntArrayArrayArray3 = null;
-		Static24.aClass13_8 = null;
+		Static24.component = null;
 		Static34.aByteArrayArrayArray3 = null;
 		Static145.anIntArray330 = null;
 		Static125.aByteArrayArrayArray10 = null;

client/src/main/java/Static118.java

@@ -29,14 +29,14 @@ public final class Static118 {
 	public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
 		for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
 			@Pc(15) Component local15 = arg1[local7];
-			if (local15 != null && local15.anInt456 == arg0 && (!local15.aBoolean32 || !Static36.method947(local15))) {
+			if (local15 != null && local15.layer == arg0 && (!local15.aBoolean32 || !Static36.method947(local15))) {
 				if (local15.anInt452 == 0) {
 					if (!local15.aBoolean32 && Static36.method947(local15) && local15 != Static180.aClass13_22) {
 						continue;
 					}
 					method2354(local15.anInt507, arg1);
-					if (local15.aClass13Array3 != null) {
+					if (local15.createdComponents != null) {
-						method2354(local15.anInt507, local15.aClass13Array3);
+						method2354(local15.anInt507, local15.createdComponents);
 					}
 					@Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local15.anInt507);
 					if (local73 != null) {
@@ -77,13 +77,13 @@ public final class Static118 {
 							}
 						}
 					}
-					if (local15.anInt483 != 0 && !local15.aBoolean32) {
+					if (local15.modelRotationSpeed != 0 && !local15.aBoolean32) {
-						@Pc(239) int local239 = local15.anInt483 >> 16;
+						@Pc(239) int local239 = local15.modelRotationSpeed >> 16;
 						@Pc(243) int local243 = local239 * Static178.anInt4247;
-						local105 = local15.anInt483 << 16 >> 16;
+						local105 = local15.modelRotationSpeed << 16 >> 16;
-						local15.anInt450 = local243 + local15.anInt450 & 0x7FF;
+						local15.modelXAngle = local243 + local15.modelXAngle & 0x7FF;
 						local105 *= Static178.anInt4247;
-						local15.anInt524 = local15.anInt524 + local105 & 0x7FF;
+						local15.modelYAngle = local15.modelYAngle + local105 & 0x7FF;
 						Static43.method1143(local15);
 					}
 				}

client/src/main/java/Static119.java

@@ -23,7 +23,7 @@ public final class Static119 {
 	public static final JagString aClass100_589 = Static28.parse(" <col=ffffff>");
 
 	@OriginalMember(owner = "client!je", name = "fb", descriptor = "I")
-	public static int anInt3028 = 1;
+	public static int transmitTimer = 1;
 
 	@OriginalMember(owner = "client!je", name = "h", descriptor = "(I)V")
 	public static void method2380() {

client/src/main/java/Static122.java

@@ -23,7 +23,7 @@ public final class Static122 {
 	public static final JagString aClass100_591 = Static28.parse("(Udns");
 
 	@OriginalMember(owner = "client!jh", name = "j", descriptor = "I")
-	public static int anInt3047 = 0;
+	public static int x = 0;
 
 	@OriginalMember(owner = "client!jh", name = "a", descriptor = "(Lclient!ve;ZIIZI)V")
 	public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) {

client/src/main/java/Static124.java

@@ -8,7 +8,7 @@ public final class Static124 {
 	public static int anInt3080;
 
 	@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
-	public static BufferedSocket aClass95_2;
+	public static BufferedSocket socket;
 
 	@OriginalMember(owner = "client!jk", name = "J", descriptor = "I")
 	public static int anInt3083;

client/src/main/java/Static125.java

@@ -31,12 +31,12 @@ public final class Static125 {
 
 	@OriginalMember(owner = "client!jl", name = "a", descriptor = "(IIIII)V")
 	public static void method2448(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		Static6.aClass3_Sub15_Sub1_1.offset = 0;
+		Static6.outboundBuffer.offset = 0;
-		Static6.aClass3_Sub15_Sub1_1.p1(147);
+		Static6.outboundBuffer.p1(147);
-		Static6.aClass3_Sub15_Sub1_1.p1(arg2);
+		Static6.outboundBuffer.p1(arg2);
-		Static6.aClass3_Sub15_Sub1_1.p1(arg3);
+		Static6.outboundBuffer.p1(arg3);
-		Static6.aClass3_Sub15_Sub1_1.p2(arg0);
+		Static6.outboundBuffer.p2(arg0);
-		Static6.aClass3_Sub15_Sub1_1.p2(arg1);
+		Static6.outboundBuffer.p2(arg1);
 		Static226.anInt5079 = 0;
 		Static57.anInt1758 = 0;
 		Static179.anInt4261 = 1;
@@ -62,11 +62,11 @@ public final class Static125 {
 	public static void method2450() {
 		@Pc(9) int local9 = Static248.anInt4232 * 128 + 64;
 		@Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
-		@Pc(23) int local23 = Static207.method3685(Static55.anInt1735, local15, local9) - Static231.anInt5203;
+		@Pc(23) int local23 = Static207.method3685(Static55.level, local15, local9) - Static231.anInt5203;
 		if (Static113.anInt4612 >= 100) {
 			Static138.anInt3439 = Static245.anInt5375 * 128 + 64;
 			Static134.anInt3302 = Static248.anInt4232 * 128 + 64;
-			Static5.anInt40 = Static207.method3685(Static55.anInt1735, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203;
+			Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203;
 		} else {
 			if (Static138.anInt3439 < local15) {
 				Static138.anInt3439 += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.anInt3439) / 1000;
@@ -107,7 +107,7 @@ public final class Static125 {
 		}
 		local9 = Static265.anInt5765 * 128 + 64;
 		local15 = Static251.anInt5449 * 128 + 64;
-		local23 = Static207.method3685(Static55.anInt1735, local15, local9) - Static57.anInt1744;
+		local23 = Static207.method3685(Static55.level, local15, local9) - Static57.anInt1744;
 		@Pc(236) int local236 = local23 - Static5.anInt40;
 		@Pc(241) int local241 = local9 - Static134.anInt3302;
 		@Pc(246) int local246 = local15 - Static138.anInt3439;

client/src/main/java/Static126.java

@@ -17,8 +17,8 @@ public final class Static126 {
 
 	@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
 	public static void method2460() {
-		if (Static154.anInt3711 != -1) {
+		if (Static154.topLevelInterace != -1) {
-			Static96.method1949(Static154.anInt3711);
+			Static96.method1949(Static154.topLevelInterace);
 		}
 		for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) {
 			if (Static186.aBooleanArray100[local15]) {
@@ -34,7 +34,7 @@ public final class Static126 {
 			Static263.aBoolean299 = true;
 		}
 		Static214.anInt5574 = -1;
-		if (Static154.anInt3711 != -1) {
+		if (Static154.topLevelInterace != -1) {
 			Static24.anInt766 = 0;
 			Static9.method182();
 		}

client/src/main/java/Static127.java

@@ -45,13 +45,13 @@ public final class Static127 {
 			Static196.method3534(25);
 		}
 		Static114.method4636(true, LocalizedText.LOADING);
-		@Pc(53) int local53 = Static142.anInt3483;
+		@Pc(53) int local53 = Static142.originZ;
-		@Pc(55) int local55 = Static225.anInt5068;
+		@Pc(55) int local55 = Static225.originX;
-		Static142.anInt3483 = arg1 * 8 - 48;
+		Static142.originZ = arg1 * 8 - 48;
-		Static225.anInt5068 = (arg2 - 6) * 8;
+		Static225.originX = (arg2 - 6) * 8;
 		Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8);
-		@Pc(81) int local81 = Static142.anInt3483 - local53;
+		@Pc(81) int local81 = Static142.originZ - local53;
-		@Pc(86) int local86 = Static225.anInt5068 - local55;
+		@Pc(86) int local86 = Static225.originX - local55;
 		Static235.aClass134_2 = null;
 		@Pc(96) int local96;
 		@Pc(103) Npc local103;
@@ -65,8 +65,8 @@ public final class Static127 {
 					local103.anInt3421 -= local81 * 128;
 					if (local103.anInt3412 >= 0 && local103.anInt3412 <= 13184 && local103.anInt3421 >= 0 && local103.anInt3421 <= 13184) {
 						for (local109 = 0; local109 < 10; local109++) {
-							local103.anIntArray318[local109] -= local86;
+							local103.movementQueueX[local109] -= local86;
-							local103.anIntArray317[local109] -= local81;
+							local103.movementQueueZ[local109] -= local81;
 						}
 						Static33.anIntArray79[Static272.anInt5214++] = local96;
 					} else {
@@ -80,8 +80,8 @@ public final class Static127 {
 				local103 = Static175.aClass8_Sub4_Sub2Array1[local96];
 				if (local103 != null) {
 					for (local109 = 0; local109 < 10; local109++) {
-						local103.anIntArray318[local109] -= local86;
+						local103.movementQueueX[local109] -= local86;
-						local103.anIntArray317[local109] -= local81;
+						local103.movementQueueZ[local109] -= local81;
 					}
 					local103.anInt3412 -= local86 * 128;
 					local103.anInt3421 -= local81 * 128;
@@ -92,15 +92,15 @@ public final class Static127 {
 			@Pc(265) Player local265 = Static159.aClass8_Sub4_Sub1Array1[local96];
 			if (local265 != null) {
 				for (local109 = 0; local109 < 10; local109++) {
-					local265.anIntArray318[local109] -= local86;
+					local265.movementQueueX[local109] -= local86;
-					local265.anIntArray317[local109] -= local81;
+					local265.movementQueueZ[local109] -= local81;
 				}
 				local265.anInt3412 -= local86 * 128;
 				local265.anInt3421 -= local81 * 128;
 			}
 		}
-		Static55.anInt1735 = arg0;
+		Static55.level = arg0;
-		Static173.aClass8_Sub4_Sub1_2.method1265(arg5, false, arg3);
+		Static173.self.method1265(arg5, false, arg3);
 		@Pc(322) byte local322 = 104;
 		@Pc(324) byte local324 = 0;
 		@Pc(326) byte local326 = 0;
@@ -161,7 +161,7 @@ public final class Static127 {
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
-	public static DelayedStateChange method2464() {
+	public static DelayedStateChange poll() {
 		@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.aClass16_9.method795();
 		if (local10 != null) {
 			local10.method4658();
@@ -211,8 +211,8 @@ public final class Static127 {
 													if (Static232.aClass212_5 != null) {
 														local246 = Static181.method3341(Static232.aClass212_5.anInt5926);
 														try {
-															if (Static232.aClass212_5.anObject6 != null) {
+															if (Static232.aClass212_5.result != null) {
-																@Pc(265) byte[] local265 = ((String) Static232.aClass212_5.anObject6).getBytes("ISO-8859-1");
+																@Pc(265) byte[] local265 = ((String) Static232.aClass212_5.result).getBytes("ISO-8859-1");
 																local246 = Static10.decodeString(local265, local265.length, 0);
 															}
 														} catch (@Pc(274) UnsupportedEncodingException local274) {
@@ -239,7 +239,7 @@ public final class Static127 {
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!na;Z)V")
 	public static void method2470(@OriginalArg(0) JagString arg0) {
-		if (Static191.anInt4502 >= 2) {
+		if (Static191.staffModLevel >= 2) {
 			@Pc(18) int local18;
 			@Pc(38) int local38;
 			@Pc(29) Runtime local29;
@@ -288,7 +288,7 @@ public final class Static127 {
 			}
 			if (arg0.method3111(Static165.aClass100_775)) {
 				Static71.signLink.method5110();
-				Static124.aClass95_2.method2833();
+				Static124.socket.method2833();
 				Static107.js5NetQueue.method2323();
 			}
 			if (arg0.method3111(Static114.aClass100_1100)) {
@@ -327,7 +327,7 @@ public final class Static127 {
 			if (arg0.method3138(Static241.aClass100_1088)) {
 				Static76.method1645(arg0.method3136(15).method3132());
 				Static203.method3663(Static71.signLink);
-				Static18.aBoolean39 = false;
+				Static18.sentToServer = false;
 			}
 			if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
 				Static115.method2312(arg0.method3136(6).method3132());
@@ -361,8 +361,8 @@ public final class Static127 {
 				}
 			}
 		}
-		Static6.aClass3_Sub15_Sub1_1.method2242(44);
+		Static6.outboundBuffer.p1isaac(44);
-		Static6.aClass3_Sub15_Sub1_1.p1(arg0.length() - 1);
+		Static6.outboundBuffer.p1(arg0.length() - 1);
-		Static6.aClass3_Sub15_Sub1_1.pjstr(arg0.method3136(2));
+		Static6.outboundBuffer.pjstr(arg0.method3136(2));
 	}
 }

client/src/main/java/Static13.java

@@ -30,7 +30,7 @@ public final class Static13 {
 			local32 = Static34.method882(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 });
 		} else if (Static241.aBoolean302 && Static231.anInt5204 < 2) {
 			local32 = Static34.method882(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
-		} else if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
+		} else if (Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2) {
 			local32 = Static269.method2228(Static231.anInt5204 - 2);
 		} else {
 			local32 = Static269.method2228(Static231.anInt5204 - 1);

client/src/main/java/Static132.java

@@ -25,7 +25,7 @@ public final class Static132 {
 			Static109.method2275(local16);
 		}
 		Static273.method3214(local16);
-		@Pc(32) Component local32 = Static5.method32(local9);
+		@Pc(32) Component local32 = Static5.getComponent(local9);
 		if (local32 != null) {
 			Static43.method1143(local32);
 		}
@@ -51,8 +51,8 @@ public final class Static132 {
 			Static13.anInt436 = Static231.anInt5204 * 15 + (Static261.aBoolean298 ? 26 : 22);
 			Static24.anInt761 = local43 + 8;
 		}
-		if (Static154.anInt3711 != -1) {
+		if (Static154.topLevelInterace != -1) {
-			Static54.method1304(1, Static154.anInt3711);
+			Static54.method1304(1, Static154.topLevelInterace);
 		}
 	}
 
@@ -60,16 +60,16 @@ public final class Static132 {
 	public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
 		local8.method1017();
-		local8.anInt1271 = arg1;
+		local8.intArg1 = arg1;
 	}
 
 	@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
 	public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
 		local8.method1017();
-		local8.anInt1270 = arg3;
+		local8.intArg3 = arg3;
-		local8.anInt1269 = arg0;
+		local8.intArg2 = arg0;
-		local8.anInt1271 = arg1;
+		local8.intArg1 = arg1;
 	}
 
 	@OriginalMember(owner = "client!ke", name = "f", descriptor = "(B)V")

client/src/main/java/Static133.java

@@ -8,7 +8,7 @@ public final class Static133 {
 	public static int anInt5230;
 
 	@OriginalMember(owner = "client!kf", name = "c", descriptor = "J")
-	public static long aLong175 = 0L;
+	public static long clickTime = 0L;
 
 	@OriginalMember(owner = "client!kf", name = "d", descriptor = "[Lclient!cl;")
 	public static final AnimFrameset[] aClass3_Sub2_Sub7Array7 = new AnimFrameset[14];

client/src/main/java/Static134.java

@@ -36,7 +36,7 @@ public final class Static134 {
 
 	@OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)V")
 	public static void method2623() {
-		Static6.aClass3_Sub15_Sub1_1.method2242(104);
+		Static6.outboundBuffer.p1isaac(104);
-		Static6.aClass3_Sub15_Sub1_1.p8(0L);
+		Static6.outboundBuffer.p8(0L);
 	}
 }

client/src/main/java/Static136.java

@@ -21,7 +21,7 @@ public final class Static136 {
 	public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
 		local4.method1017();
-		local4.anInt1271 = arg0;
+		local4.intArg1 = arg0;
 	}
 
 	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(ZLjava/awt/event/KeyEvent;)I")

client/src/main/java/Static137.java

@@ -50,7 +50,7 @@ public final class Static137 {
 			Static251.anInt5454 = 0;
 			for (local37 = 0; local37 < 104; local37++) {
 				for (local76 = 0; local76 < 104; local76++) {
-					@Pc(169) long local169 = Static20.method602(Static55.anInt1735, local37 + 0, local76);
+					@Pc(169) long local169 = Static20.method602(Static55.level, local37 + 0, local76);
 					if (local169 != 0L) {
 						@Pc(184) LocType local184 = Static271.method4601((int) (local169 >>> 32) & Integer.MAX_VALUE);
 						@Pc(187) int local187 = local184.anInt4400;
@@ -70,7 +70,7 @@ public final class Static137 {
 							@Pc(237) int local237 = local76;
 							local194 = local37;
 							if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) {
-								@Pc(269) int[][] local269 = Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30;
+								@Pc(269) int[][] local269 = Static148.aClass97Array1[Static55.level].anIntArrayArray30;
 								for (@Pc(271) int local271 = 0; local271 < 10; local271++) {
 									@Pc(281) int local281 = (int) (Math.random() * 4.0D);
 									if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) {

client/src/main/java/Static138.java

@@ -65,7 +65,7 @@ public final class Static138 {
 	public static final JagString[] aClass100Array102 = new JagString[] { aClass100_649, aClass100_650, aClass100_646, aClass100_655, aClass100_644, aClass100_656, aClass100_642, aClass100_653, aClass100_657, aClass100_658, aClass100_645, aClass100_641 };
 
 	@OriginalMember(owner = "client!km", name = "Bc", descriptor = "[I")
-	public static final int[] anIntArray323 = new int[32];
+	public static final int[] updatedVarcs = new int[32];
 
 	@OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;")
 	public static final JagString aClass100_652 = Static28.parse("loginscreen");

client/src/main/java/Static140.java

@@ -71,15 +71,15 @@ public final class Static140 {
 				return;
 			}
 		}
-		if (local34.method3108(Static173.aClass8_Sub4_Sub1_2.aClass100_364)) {
+		if (local34.method3108(Static173.self.aClass100_364)) {
 			Static103.method2231(Static186.aClass100_827, 0, LocalizedText.IGNORECANTADDSELF);
 			return;
 		}
 		Static190.aLongArray6[Static35.anInt1093] = arg0;
 		Static193.aClass100Array134[Static35.anInt1093++] = Static79.method1702(arg0);
-		Static185.anInt4369 = Static119.anInt3028;
+		Static185.anInt4369 = Static119.transmitTimer;
-		Static6.aClass3_Sub15_Sub1_1.method2242(34);
+		Static6.outboundBuffer.p1isaac(34);
-		Static6.aClass3_Sub15_Sub1_1.p8(arg0);
+		Static6.outboundBuffer.p8(arg0);
 	}
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lsignlink!ll;Ljava/lang/Object;I)V")

client/src/main/java/Static141.java

@@ -84,7 +84,7 @@ public final class Static141 {
 		if (arg0 && Static113.anInt4612 >= 100) {
 			Static138.anInt3439 = Static245.anInt5375 * 128 + 64;
 			Static134.anInt3302 = Static248.anInt4232 * 128 + 64;
-			Static5.anInt40 = Static207.method3685(Static55.anInt1735, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203;
+			Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203;
 		}
 		Static227.anInt5096 = 2;
 	}

client/src/main/java/Static142.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static142 {
 
 	@OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
-	public static int anInt3483;
+	public static int originZ;
 
 	@OriginalMember(owner = "client!lc", name = "e", descriptor = "Lclient!n;")
 	public static final SoftLruHashTable aClass99_23 = new SoftLruHashTable(64);
@@ -29,7 +29,7 @@ public final class Static142 {
 		for (local5 = -1; local5 < Static267.anInt5774 + Static272.anInt5214; local5++) {
 			@Pc(17) PathingEntity local17;
 			if (local5 == -1) {
-				local17 = Static173.aClass8_Sub4_Sub1_2;
+				local17 = Static173.self;
 			} else if (Static267.anInt5774 > local5) {
 				local17 = Static159.aClass8_Sub4_Sub1Array1[Static105.anIntArray256[local5]];
 			} else {
@@ -314,7 +314,7 @@ public final class Static142 {
 	}
 
 	@OriginalMember(owner = "client!lc", name = "a", descriptor = "(B)I")
-	public static int method2727() {
+	public static int getIdleLoops() {
 		return Static93.anInt2467;
 	}
 }

client/src/main/java/Static145.java

@@ -98,9 +98,9 @@ public final class Static145 {
 	public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(10, arg0);
 		local8.method1017();
-		local8.anInt1270 = arg2;
+		local8.intArg3 = arg2;
-		local8.anInt1271 = arg3;
+		local8.intArg1 = arg3;
-		local8.anInt1269 = arg1;
+		local8.intArg2 = arg1;
 	}
 
 	@OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I")

client/src/main/java/Static150.java

@@ -14,7 +14,7 @@ public final class Static150 {
 	public static int anInt3582 = 0;
 
 	@OriginalMember(owner = "client!lk", name = "Z", descriptor = "I")
-	public static int anInt3585 = 0;
+	public static int clickButton = 0;
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!ve;)I")
 	public static int method2797(@OriginalArg(1) Js5 arg0) {
@@ -38,16 +38,16 @@ public final class Static150 {
 		@Pc(4) int local4 = arg2.anInt445;
 		@Pc(7) int local7 = arg2.anInt459;
 		if (arg2.aByte5 == 0) {
-			arg2.anInt445 = arg2.anInt446;
+			arg2.anInt445 = arg2.baseWidth;
 		} else if (arg2.aByte5 == 1) {
-			arg2.anInt445 = arg1 - arg2.anInt446;
+			arg2.anInt445 = arg1 - arg2.baseWidth;
 		} else if (arg2.aByte5 == 2) {
-			arg2.anInt445 = arg2.anInt446 * arg1 >> 14;
+			arg2.anInt445 = arg2.baseWidth * arg1 >> 14;
 		} else if (arg2.aByte5 == 3) {
 			if (arg2.anInt452 == 2) {
-				arg2.anInt445 = arg2.anInt446 * 32 + (arg2.anInt446 - 1) * arg2.anInt512;
+				arg2.anInt445 = arg2.baseWidth * 32 + (arg2.baseWidth - 1) * arg2.anInt512;
 			} else if (arg2.anInt452 == 7) {
-				arg2.anInt445 = arg2.anInt446 * 115 + arg2.anInt512 * (arg2.anInt446 - 1);
+				arg2.anInt445 = arg2.baseWidth * 115 + arg2.anInt512 * (arg2.baseWidth - 1);
 			}
 		}
 		if (arg2.aByte3 == 0) {
@@ -88,7 +88,7 @@ public final class Static150 {
 		if (arg3 && arg2.anObjectArray17 != null && (local4 != arg2.anInt445 || arg2.anInt459 != local7)) {
 			@Pc(305) HookRequest local305 = new HookRequest();
 			local305.anObjectArray31 = arg2.anObjectArray17;
-			local305.aClass13_17 = arg2;
+			local305.source = arg2;
 			Static185.aClass69_101.method2282(local305);
 		}
 	}

client/src/main/java/Static153.java

@@ -41,7 +41,7 @@ public final class Static153 {
 	public static void method2905(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(7, arg0);
 		local14.method1017();
-		local14.anInt1271 = arg1;
+		local14.intArg1 = arg1;
 	}
 
 	@OriginalMember(owner = "client!mc", name = "a", descriptor = "(IIIIIIII)V")
@@ -67,7 +67,7 @@ public final class Static153 {
 
 	@OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V")
 	public static void method2909() {
-		Static6.aClass3_Sub15_Sub1_1.method2242(184);
+		Static6.outboundBuffer.p1isaac(184);
 		for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
 			if (local18.anInt5879 == 0) {
 				Static132.method2605(true, local18);

client/src/main/java/Static154.java

@@ -21,7 +21,7 @@ public final class Static154 {
 	public static final short[][] aShortArrayArray6 = 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 } };
 
 	@OriginalMember(owner = "client!md", name = "W", descriptor = "I")
-	public static int anInt3711 = -1;
+	public static int topLevelInterace = -1;
 
 	@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
 	public static boolean method2926(@OriginalArg(0) Component arg0) {
@@ -62,7 +62,7 @@ public final class Static154 {
 		Static62.anInt1941++;
 		Static26.anIntArray67[0] = arg1;
 		Static153.aClass100Array112[0] = arg4;
-		Static49.anInt1464 = Static119.anInt3028;
+		Static49.anInt1464 = Static119.transmitTimer;
 		Static241.anIntArray521[0] = arg0;
 		Static230.aClass100Array158[0] = arg2;
 		Static64.aClass100Array62[0] = arg3;

client/src/main/java/Static155.java

@@ -11,7 +11,7 @@ public final class Static155 {
 	public static int anInt3718 = -1;
 
 	@OriginalMember(owner = "client!me", name = "P", descriptor = "[I")
-	public static final int[] anIntArray355 = new int[2000];
+	public static final int[] varcs = new int[2000];
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(IB)V")
 	public static void method2940(@OriginalArg(0) int arg0) {

client/src/main/java/Static156.java

@@ -110,8 +110,8 @@ public final class Static156 {
 	@OriginalMember(owner = "client!mf", name = "a", descriptor = "(JI)V")
 	public static void method2956(@OriginalArg(0) long arg0) {
 		if ((long) 0 != arg0) {
-			Static6.aClass3_Sub15_Sub1_1.method2242(104);
+			Static6.outboundBuffer.p1isaac(104);
-			Static6.aClass3_Sub15_Sub1_1.p8(arg0);
+			Static6.outboundBuffer.p8(arg0);
 		}
 	}
 

client/src/main/java/Static158.java

@@ -27,9 +27,9 @@ public final class Static158 {
 		}
 		try {
 			if (++Static226.anInt5079 > 2000) {
-				if (Static124.aClass95_2 != null) {
+				if (Static124.socket != null) {
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 				}
 				if (Static57.anInt1758 >= 1) {
 					Static223.anInt5034 = -5;
@@ -57,16 +57,16 @@ public final class Static158 {
 				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
 				Static72.aClass212_3 = null;
-				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				local120 = Static124.aClass95_2.read();
+				local120 = Static124.socket.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -76,38 +76,38 @@ public final class Static158 {
 				if (local120 != 21) {
 					Static223.anInt5034 = local120;
 					Static179.anInt4261 = 0;
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 					return;
 				}
 				Static179.anInt4261 = 3;
 			}
 			if (Static179.anInt4261 == 3) {
-				if (Static124.aClass95_2.available() < 1) {
+				if (Static124.socket.available() < 1) {
 					return;
 				}
-				Static229.aClass100Array156 = new JagString[Static124.aClass95_2.read()];
+				Static229.aClass100Array156 = new JagString[Static124.socket.read()];
 				Static179.anInt4261 = 4;
 			}
 			if (Static179.anInt4261 == 4) {
-				if (Static124.aClass95_2.available() < Static229.aClass100Array156.length * 8) {
+				if (Static124.socket.available() < Static229.aClass100Array156.length * 8) {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
-				Static124.aClass95_2.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data);
 				for (local120 = 0; local120 < Static229.aClass100Array156.length; local120++) {
 					Static229.aClass100Array156[local120] = Static79.method1702(Static57.aClass3_Sub15_Sub1_3.g8());
 				}
 				Static223.anInt5034 = 21;
 				Static179.anInt4261 = 0;
-				Static124.aClass95_2.method2834();
+				Static124.socket.method2834();
-				Static124.aClass95_2 = null;
+				Static124.socket = null;
 				return;
 			}
 		} catch (@Pc(238) IOException local238) {
-			if (Static124.aClass95_2 != null) {
+			if (Static124.socket != null) {
-				Static124.aClass95_2.method2834();
+				Static124.socket.method2834();
-				Static124.aClass95_2 = null;
+				Static124.socket = null;
 			}
 			if (Static57.anInt1758 < 1) {
 				Static57.anInt1758++;
@@ -153,9 +153,9 @@ public final class Static158 {
 					@Pc(103) int local103 = local74.g2();
 					@Pc(107) int local107 = local103 >> 14;
 					@Pc(113) int local113 = local103 >> 7 & 0x3F;
-					@Pc(125) int local125 = local113 + (Static238.anIntArray470[local16] >> 8) * 64 - Static225.anInt5068;
+					@Pc(125) int local125 = local113 + (Static238.anIntArray470[local16] >> 8) * 64 - Static225.originX;
 					@Pc(129) int local129 = local103 & 0x3F;
-					@Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.anInt3483;
+					@Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.originZ;
 					@Pc(148) NpcType local148 = Static214.method4363(local74.g2());
 					if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
 						Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc();

client/src/main/java/Static164.java

@@ -8,7 +8,7 @@ public final class Static164 {
 	public static boolean aBoolean192;
 
 	@OriginalMember(owner = "client!na", name = "W", descriptor = "Z")
-	public static boolean aBoolean194;
+	public static boolean newTab;
 
 	@OriginalMember(owner = "client!na", name = "h", descriptor = "Z")
 	public static boolean aBoolean191 = false;

client/src/main/java/Static169.java

@@ -24,7 +24,7 @@ public final class Static169 {
 	public static int anInt4075 = -1;
 
 	@OriginalMember(owner = "client!nf", name = "a", descriptor = "(Lclient!na;BZ)V")
-	public static void method3175(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) {
+	public static void openUrl(@OriginalArg(0) JagString arg0, @OriginalArg(2) boolean arg1) {
 		if (!arg1) {
 			try {
 				Static230.anApplet_Sub1_1.getAppletContext().showDocument(arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()), "_top");
@@ -68,7 +68,7 @@ public final class Static169 {
 		while (local90.status == 0) {
 			Static231.method3983(10L);
 		}
-		@Pc(103) Frame local103 = (Frame) local90.anObject6;
+		@Pc(103) Frame local103 = (Frame) local90.result;
 		if (local103 == null) {
 			return null;
 		} else if (local90.status == 2) {

client/src/main/java/Static17.java

@@ -14,7 +14,7 @@ public final class Static17 {
 	public static final int[] anIntArray53 = new int[128];
 
 	@OriginalMember(owner = "client!bg", name = "M", descriptor = "I")
-	public static int anInt577 = 0;
+	public static int milliseconds = 0;
 
 	@OriginalMember(owner = "client!bg", name = "N", descriptor = "Lclient!na;")
 	public static final JagString aClass100_102 = Static28.parse("mapfunction");
@@ -35,7 +35,7 @@ public final class Static17 {
 		@Pc(64) int local64;
 		if (local23 == 1) {
 			local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3);
-			Static173.aClass8_Sub4_Sub1_2.method2684(1, local54);
+			Static173.self.method2684(1, local54);
 			local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
 			if (local64 == 1) {
 				Static44.anIntArray106[Static116.anInt2951++] = 2047;
@@ -43,12 +43,12 @@ public final class Static17 {
 		} else if (local23 == 2) {
 			if (Static57.aClass3_Sub15_Sub1_3.method2238(1) == 1) {
 				local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3);
-				Static173.aClass8_Sub4_Sub1_2.method2684(2, local54);
+				Static173.self.method2684(2, local54);
 				local64 = Static57.aClass3_Sub15_Sub1_3.method2238(3);
-				Static173.aClass8_Sub4_Sub1_2.method2684(2, local64);
+				Static173.self.method2684(2, local64);
 			} else {
 				local54 = Static57.aClass3_Sub15_Sub1_3.method2238(3);
-				Static173.aClass8_Sub4_Sub1_2.method2684(0, local54);
+				Static173.self.method2684(0, local54);
 			}
 			local54 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
 			if (local54 == 1) {
@@ -57,13 +57,13 @@ public final class Static17 {
 		} else if (local23 == 3) {
 			local54 = Static57.aClass3_Sub15_Sub1_3.method2238(7);
 			local64 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
-			Static55.anInt1735 = Static57.aClass3_Sub15_Sub1_3.method2238(2);
+			Static55.level = Static57.aClass3_Sub15_Sub1_3.method2238(2);
 			@Pc(163) int local163 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
 			if (local163 == 1) {
 				Static44.anIntArray106[Static116.anInt2951++] = 2047;
 			}
 			@Pc(181) int local181 = Static57.aClass3_Sub15_Sub1_3.method2238(7);
-			Static173.aClass8_Sub4_Sub1_2.method1265(local181, local64 == 1, local54);
+			Static173.self.method1265(local181, local64 == 1, local54);
 		}
 	}
 
@@ -76,9 +76,9 @@ public final class Static17 {
 	public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) {
 		@Pc(20) int local20 = arg0.anInt486 == 0 ? arg0.anInt445 : arg0.anInt486;
 		@Pc(32) int local32 = arg0.anInt491 == 0 ? arg0.anInt459 : arg0.anInt491;
-		Static266.method4190(arg0.anInt507, arg1, local20, local32, Static241.aClass13ArrayArray12[arg0.anInt507 >> 16]);
+		Static266.method4190(arg0.anInt507, arg1, local20, local32, Static241.components[arg0.anInt507 >> 16]);
-		if (arg0.aClass13Array3 != null) {
+		if (arg0.createdComponents != null) {
-			Static266.method4190(arg0.anInt507, arg1, local20, local32, arg0.aClass13Array3);
+			Static266.method4190(arg0.anInt507, arg1, local20, local32, arg0.createdComponents);
 		}
 		@Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.method3863((long) arg0.anInt507);
 		if (local66 != null) {

client/src/main/java/Static171.java

@@ -48,8 +48,8 @@ public final class Static171 {
 
 	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;I)V")
 	public static void method3221(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) {
-		Static6.aClass3_Sub15_Sub1_1.method2242(188);
+		Static6.outboundBuffer.p1isaac(188);
-		Static6.aClass3_Sub15_Sub1_1.p1a(arg1);
+		Static6.outboundBuffer.p1a(arg1);
-		Static6.aClass3_Sub15_Sub1_1.p8(arg0.method3158());
+		Static6.outboundBuffer.p8(arg0.method3158());
 	}
 }

client/src/main/java/Static173.java

@@ -14,7 +14,7 @@ public final class Static173 {
 	public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array9;
 
 	@OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;")
-	public static Player aClass8_Sub4_Sub1_2;
+	public static Player self;
 
 	@OriginalMember(owner = "client!nk", name = "n", descriptor = "[Lclient!sl;")
 	public static final SynthSound[] aClass138Array1 = new SynthSound[50];
@@ -128,8 +128,8 @@ public final class Static173 {
 				if (!local16.aClass96_1.aBoolean183) {
 					local262 |= Long.MIN_VALUE;
 				}
-				local16.anInt3424 = Static207.method3685(Static55.anInt1735, local16.anInt3412, local16.anInt3421);
+				local16.anInt3424 = Static207.method3685(Static55.level, local16.anInt3412, local16.anInt3421);
-				Static43.method1141(Static55.anInt1735, local16.anInt3412, local16.anInt3421, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
+				Static43.method1141(Static55.level, local16.anInt3412, local16.anInt3421, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
 			}
 		}
 	}

client/src/main/java/Static175.java

@@ -6,7 +6,7 @@ public final class Static175 {
 	public static int[] anIntArray371;
 
 	@OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
-	public static JagString aClass100_797;
+	public static JagString url;
 
 	@OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;")
 	public static final Npc[] aClass8_Sub4_Sub2Array1 = new Npc[32768];
@@ -25,8 +25,8 @@ public final class Static175 {
 		if (Static267.anInt5775 > 0) {
 			Static278.method4653();
 		} else {
-			Static233.aClass95_4 = Static124.aClass95_2;
+			Static233.aClass95_4 = Static124.socket;
-			Static124.aClass95_2 = null;
+			Static124.socket = null;
 			Static196.method3534(40);
 		}
 	}

client/src/main/java/Static176.java

@@ -95,7 +95,7 @@ public final class Static176 {
 			if (local121 != local112) {
 				local112 = local121;
 				@Pc(240) int local240;
-				if (local133 == 2 && Static257.method523(Static55.anInt1735, local47, local147, local121)) {
+				if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) {
 					@Pc(172) LocType local172 = Static271.method4601(local140);
 					if (local172.anIntArray380 != null) {
 						local172 = local172.method3417();
@@ -203,7 +203,7 @@ public final class Static176 {
 					Static217.method3767(local140, local147, local688, local47);
 				}
 				if (local133 == 3) {
-					@Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][local47][local147];
+					@Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Static55.level][local47][local147];
 					if (local931 != null) {
 						for (@Pc(940) ObjStackNode local940 = (ObjStackNode) local931.method2279(); local940 != null; local940 = (ObjStackNode) local931.method2286()) {
 							local240 = local940.aClass8_Sub7_1.anInt5555;

client/src/main/java/Static178.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static178 {
 
 	@OriginalMember(owner = "client!od", name = "f", descriptor = "Lclient!jd;")
-	public static MouseRecorder aClass74_1;
+	public static MouseRecorder instance;
 
 	@OriginalMember(owner = "client!od", name = "c", descriptor = "Z")
 	public static boolean aBoolean202 = true;
@@ -36,8 +36,8 @@ public final class Static178 {
 			local24++;
 		}
 		if (local24 < Static199.aClass3_Sub22Array1.length && Static199.aClass3_Sub22Array1[local24] != null) {
-			Static6.aClass3_Sub15_Sub1_1.method2242(162);
+			Static6.outboundBuffer.p1isaac(162);
-			Static6.aClass3_Sub15_Sub1_1.p8(Static199.aClass3_Sub22Array1[local24].aLong192);
+			Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].aLong192);
 		}
 	}
 

client/src/main/java/Static179.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static179 {
 
 	@OriginalMember(owner = "client!oe", name = "a", descriptor = "I")
-	public static int anInt4253 = 0;
+	public static int mouseRecorderPrevY = 0;
 
 	@OriginalMember(owner = "client!oe", name = "b", descriptor = "I")
 	public static int anInt4254 = 0;

client/src/main/java/Static18.java

@@ -17,7 +17,7 @@ public final class Static18 {
 	public static final JagString aClass100_107 = Static28.parse("floorshadows");
 
 	@OriginalMember(owner = "client!bh", name = "z", descriptor = "Z")
-	public static boolean aBoolean39 = true;
+	public static boolean sentToServer = true;
 
 	@OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;")
 	public static final JagString aClass100_108 = Static28.parse("<br>(X100(U(Y");

client/src/main/java/Static182.java

@@ -20,7 +20,7 @@ public final class Static182 {
 	public static int anInt4311 = -2;
 
 	@OriginalMember(owner = "client!oj", name = "y", descriptor = "I")
-	public static int anInt4313 = 0;
+	public static int keyQueueSize = 0;
 
 	@OriginalMember(owner = "client!oj", name = "z", descriptor = "[Z")
 	public static final boolean[] aBooleanArray97 = 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, true, false };

client/src/main/java/Static183.java

@@ -11,7 +11,7 @@ public final class Static183 {
 	public static int anInt4272 = (int) (Math.random() * 33.0D) - 16;
 
 	@OriginalMember(owner = "client!ok", name = "f", descriptor = "J")
-	public static long aLong139 = 0L;
+	public static long prevClickTime = 0L;
 
 	@OriginalMember(owner = "client!ok", name = "a", descriptor = "(Lclient!ab;Lclient!ab;I)V")
 	public static void method3331(@OriginalArg(0) Node arg0, @OriginalArg(1) Node arg1) {

client/src/main/java/Static186.java

@@ -62,9 +62,9 @@ public final class Static186 {
 				Static83.aFloat3 = 8.0F;
 				Static138.aFloat14 = 8.0F;
 			}
-			@Pc(144) int local144 = (Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7) + Static225.anInt5068 - Static158.anInt3846;
+			@Pc(144) int local144 = (Static173.self.anInt3412 >> 7) + Static225.originX - Static158.anInt3846;
 			@Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5;
-			@Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.anInt3483 - (Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7) - 1;
+			@Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.originZ - (Static173.self.anInt3421 >> 7) - 1;
 			@Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5;
 			if (local153 >= 0 && Static48.anInt1449 > local153 && local177 >= 0 && local177 < Static181.anInt4296) {
 				Static13.anInt435 = local153;
@@ -173,7 +173,7 @@ public final class Static186 {
 				arg2.anInt3373 = 1;
 				arg2.anInt3425 = 0;
 				arg2.anInt3371 = 0;
-				Static152.method2836(arg2.anInt3421, local89, arg2.anInt3412, Static173.aClass8_Sub4_Sub1_2 == arg2, arg2.anInt3425);
+				Static152.method2836(arg2.anInt3421, local89, arg2.anInt3412, Static173.self == arg2, arg2.anInt3425);
 			}
 			if (local92 == 2) {
 				arg2.anInt3371 = 0;
@@ -187,7 +187,7 @@ public final class Static186 {
 			arg2.anInt3360 = 0;
 			arg2.anInt3369 = arg1;
 			if (arg2.anInt3369 != -1) {
-				Static152.method2836(arg2.anInt3421, Static36.method941(arg2.anInt3369), arg2.anInt3412, arg2 == Static173.aClass8_Sub4_Sub1_2, arg2.anInt3425);
+				Static152.method2836(arg2.anInt3421, Static36.method941(arg2.anInt3369), arg2.anInt3412, arg2 == Static173.self, arg2.anInt3425);
 			}
 		}
 	}

client/src/main/java/Static187.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static187 {
 
 	@OriginalMember(owner = "client!pb", name = "q", descriptor = "[Z")
-	public static final boolean[] aBooleanArray101 = new boolean[112];
+	public static final boolean[] pressedKeys = new boolean[112];
 
 	@OriginalMember(owner = "client!pb", name = "x", descriptor = "[[[I")
 	public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13];

client/src/main/java/Static19.java

@@ -45,7 +45,7 @@ public final class Static19 {
 	}
 
 	@OriginalMember(owner = "client!bi", name = "f", descriptor = "(B)V")
-	public static void method587() {
+	public static void loop() {
 		@Pc(11) int local11;
 		for (local11 = -1; local11 < Static267.anInt5774; local11++) {
 			@Pc(22) int local22;

client/src/main/java/Static190.java

@@ -51,7 +51,7 @@ public final class Static190 {
 	public static void method3444(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(13, arg1);
 		local14.method1017();
-		local14.anInt1271 = arg0;
+		local14.intArg1 = arg0;
 	}
 
 	@OriginalMember(owner = "client!pf", name = "c", descriptor = "(II)V")

client/src/main/java/Static191.java

@@ -18,7 +18,7 @@ public final class Static191 {
 	public static final int[] anIntArray385 = new int[anInt4506];
 
 	@OriginalMember(owner = "client!pg", name = "S", descriptor = "I")
-	public static int anInt4502 = 0;
+	public static int staffModLevel = 0;
 
 	@OriginalMember(owner = "client!pg", name = "T", descriptor = "[I")
 	public static final int[] anIntArray386 = new int[] { 76, 8, 137, 4, 0, 1, 38, 2, 19 };

client/src/main/java/Static192.java

@@ -7,7 +7,7 @@ public final class Static192 {
 	public static final Environment[][] aClass92ArrayArray1 = new Environment[13][13];
 
 	@OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V")
-	public static void method3473() {
+	public static void loop() {
 		while (true) {
 			@Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.method2287();
 			if (local17 == null) {
@@ -18,7 +18,7 @@ public final class Static192 {
 			if (local17.anInt1192 < 0) {
 				local29 = -local17.anInt1192 - 1;
 				if (local29 == Static16.anInt549) {
-					local40 = Static173.aClass8_Sub4_Sub1_2;
+					local40 = Static173.self;
 				} else {
 					local40 = Static159.aClass8_Sub4_Sub1Array1[local29];
 				}
@@ -28,7 +28,7 @@ public final class Static192 {
 			}
 			if (local40 != null) {
 				@Pc(63) LocType local63 = Static271.method4601(local17.anInt1189);
-				if (Static55.anInt1735 < 3) {
+				if (Static55.level < 3) {
 				}
 				@Pc(86) int local86;
 				@Pc(83) int local83;
@@ -43,33 +43,33 @@ public final class Static192 {
 				@Pc(110) int local110 = (local86 >> 1) + local17.anInt1190;
 				@Pc(117) int local117 = (local83 >> 1) + local17.anInt1204;
 				@Pc(126) int local126 = (local83 + 1 >> 1) + local17.anInt1204;
-				@Pc(130) int[][] local130 = Static83.anIntArrayArrayArray4[Static55.anInt1735];
+				@Pc(130) int[][] local130 = Static83.anIntArrayArrayArray4[Static55.level];
 				@Pc(157) int local157 = local130[local103][local126] + local130[local110][local126] + local130[local110][local117] + local130[local103][local117] >> 2;
 				@Pc(159) Entity local159 = null;
 				@Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198];
 				if (local164 == 0) {
-					@Pc(176) Wall local176 = Static262.method4509(Static55.anInt1735, local17.anInt1190, local17.anInt1204);
+					@Pc(176) Wall local176 = Static262.method4509(Static55.level, local17.anInt1190, local17.anInt1204);
 					if (local176 != null) {
 						local159 = local176.aClass8_5;
 					}
 				} else if (local164 == 1) {
-					@Pc(231) WallDecor local231 = Static83.method435(Static55.anInt1735, local17.anInt1190, local17.anInt1204);
+					@Pc(231) WallDecor local231 = Static83.method435(Static55.level, local17.anInt1190, local17.anInt1204);
 					if (local231 != null) {
 						local159 = local231.aClass8_3;
 					}
 				} else if (local164 == 2) {
-					@Pc(198) Scenery local198 = Static133.method4008(Static55.anInt1735, local17.anInt1190, local17.anInt1204);
+					@Pc(198) Scenery local198 = Static133.method4008(Static55.level, local17.anInt1190, local17.anInt1204);
 					if (local198 != null) {
 						local159 = local198.aClass8_4;
 					}
 				} else if (local164 == 3) {
-					@Pc(216) GroundDecor local216 = Static269.method2210(Static55.anInt1735, local17.anInt1190, local17.anInt1204);
+					@Pc(216) GroundDecor local216 = Static269.method2210(Static55.level, local17.anInt1190, local17.anInt1204);
 					if (local216 != null) {
 						local159 = local216.aClass8_1;
 					}
 				}
 				if (local159 != null) {
-					Static29.method800(Static55.anInt1735, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1);
+					Static29.method800(Static55.level, local17.anInt1204, 0, local17.anInt1190, local17.anInt1205 + 1, -1, local164, 0, local17.anInt1187 + 1);
 					local40.anInt3375 = local17.anInt1205 + Static83.anInt372;
 					local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128;
 					local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128;

client/src/main/java/Static193.java

@@ -8,7 +8,7 @@ public final class Static193 {
 	public static int anInt4539;
 
 	@OriginalMember(owner = "client!pi", name = "Y", descriptor = "I")
-	public static int anInt4542;
+	public static int keyChar;
 
 	@OriginalMember(owner = "client!pi", name = "P", descriptor = "J")
 	public static long aLong147 = 0L;
@@ -23,7 +23,7 @@ public final class Static193 {
 	public static void method3498(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
 		@Pc(10) DelayedStateChange local10 = Static238.method4143(2, arg1);
 		local10.method1017();
-		local10.aClass100_254 = arg0;
+		local10.stringArg = arg0;
 	}
 
 	@OriginalMember(owner = "client!pi", name = "a", descriptor = "(JI)V")
@@ -42,9 +42,9 @@ public final class Static193 {
 					Static106.anIntArray258[local41] = Static106.anIntArray258[local41 + 1];
 					Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1];
 				}
-				Static185.anInt4369 = Static119.anInt3028;
+				Static185.anInt4369 = Static119.transmitTimer;
-				Static6.aClass3_Sub15_Sub1_1.method2242(57);
+				Static6.outboundBuffer.p1isaac(57);
-				Static6.aClass3_Sub15_Sub1_1.p8(arg0);
+				Static6.outboundBuffer.p8(arg0);
 				break;
 			}
 		}
@@ -284,26 +284,26 @@ public final class Static193 {
 		@Pc(23) int local23 = Static259.anIntArray514[arg0];
 		@Pc(27) int local27 = Static84.anIntArray209[arg0];
 		if (arg1 == 0) {
-			Static6.aClass3_Sub15_Sub1_1.method2242(215);
+			Static6.outboundBuffer.p1isaac(215);
-			Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3);
+			Static6.outboundBuffer.p1(local13 + local13 + 3);
 		}
 		if (arg1 == 1) {
-			Static6.aClass3_Sub15_Sub1_1.method2242(39);
+			Static6.outboundBuffer.p1isaac(39);
-			Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3 + 14);
+			Static6.outboundBuffer.p1(local13 + local13 + 3 + 14);
 		}
 		if (arg1 == 2) {
-			Static6.aClass3_Sub15_Sub1_1.method2242(77);
+			Static6.outboundBuffer.p1isaac(77);
-			Static6.aClass3_Sub15_Sub1_1.p1(local13 + local13 + 3);
+			Static6.outboundBuffer.p1(local13 + local13 + 3);
 		}
-		Static6.aClass3_Sub15_Sub1_1.p1a(Static187.aBooleanArray101[82] ? 1 : 0);
+		Static6.outboundBuffer.p1a(Static187.pressedKeys[82] ? 1 : 0);
-		Static6.aClass3_Sub15_Sub1_1.p2(Static225.anInt5068 + local23);
+		Static6.outboundBuffer.p2(Static225.originX + local23);
-		Static6.aClass3_Sub15_Sub1_1.p2add(Static142.anInt3483 + local27);
+		Static6.outboundBuffer.p2add(Static142.originZ + local27);
 		Static84.anInt2255 = Static84.anIntArray209[0];
 		Static115.anInt2939 = Static259.anIntArray514[0];
 		for (@Pc(126) int local126 = 1; local126 < local13; local126++) {
 			arg0--;
-			Static6.aClass3_Sub15_Sub1_1.p1a(Static259.anIntArray514[arg0] - local23);
+			Static6.outboundBuffer.p1a(Static259.anIntArray514[arg0] - local23);
-			Static6.aClass3_Sub15_Sub1_1.p1sub(Static84.anIntArray209[arg0] - local27);
+			Static6.outboundBuffer.p1sub(Static84.anIntArray209[arg0] - local27);
 		}
 	}
 }

client/src/main/java/Static195.java

@@ -19,7 +19,7 @@ public final class Static195 {
 	public static final short[] aShortArray64 = new short[] { -10304, 9104, -1, -1, -1 };
 
 	@OriginalMember(owner = "client!pk", name = "f", descriptor = "(B)I")
-	public static int method3531() {
+	public static int getIdleLoops() {
 		return Static229.anInt5140;
 	}
 
@@ -27,7 +27,7 @@ public final class Static195 {
 	public static void method3532() {
 		for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.method2289(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.method2288()) {
 			@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
-			if (Static55.anInt1735 != local21.anInt4810 || local21.anInt4800 < Static83.anInt372) {
+			if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.anInt372) {
 				local16.method4658();
 			} else if (Static83.anInt372 >= local21.anInt4822) {
 				if (local21.anInt4819 > 0) {
@@ -40,7 +40,7 @@ public final class Static195 {
 					@Pc(102) int local102 = -local21.anInt4819 - 1;
 					@Pc(107) Player local107;
 					if (Static16.anInt549 == local102) {
-						local107 = Static173.aClass8_Sub4_Sub1_2;
+						local107 = Static173.self;
 					} else {
 						local107 = Static159.aClass8_Sub4_Sub1Array1[local102];
 					}
@@ -49,7 +49,7 @@ public final class Static195 {
 					}
 				}
 				local21.method3704(Static178.anInt4247);
-				Static43.method1141(Static55.anInt1735, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
+				Static43.method1141(Static55.level, (int) local21.aDouble8, (int) local21.aDouble3, (int) local21.aDouble6, 60, local21, local21.anInt4821, -1L, false);
 			}
 		}
 	}

client/src/main/java/Static197.java

@@ -31,7 +31,7 @@ public final class Static197 {
 		if (local17.status == 2) {
 			return new Class114[0];
 		}
-		@Pc(39) int[] local39 = (int[]) local17.anObject6;
+		@Pc(39) int[] local39 = (int[]) local17.result;
 		@Pc(45) Class114[] local45 = new Class114[local39.length >> 2];
 		for (@Pc(47) int local47 = 0; local47 < local45.length; local47++) {
 			@Pc(59) Class114 local59 = new Class114();
@@ -199,10 +199,10 @@ public final class Static197 {
 		} else {
 			Static124.aBoolean156 = false;
 		}
-		if (Static154.anInt3711 != -1) {
+		if (Static154.topLevelInterace != -1) {
 			Static210.method3712(true);
 		}
-		if (Static124.aClass95_2 != null && (Static244.anInt5370 == 30 || Static244.anInt5370 == 25)) {
+		if (Static124.socket != null && (Static244.anInt5370 == 30 || Static244.anInt5370 == 25)) {
 			Static59.method1373();
 		}
 		for (@Pc(466) int local466 = 0; local466 < 100; local466++) {

client/src/main/java/Static198.java

@@ -55,7 +55,7 @@ public final class Static198 {
 			Static65.anInt1951 = -1;
 			return;
 		}
-		@Pc(38) int local38 = Static207.method3685(Static55.anInt1735, arg5, arg2) - arg3;
+		@Pc(38) int local38 = Static207.method3685(Static55.level, arg5, arg2) - arg3;
 		@Pc(42) int local42 = arg2 - Static134.anInt3302;
 		@Pc(46) int local46 = local38 - Static5.anInt40;
 		@Pc(50) int local50 = arg5 - Static138.anInt3439;

client/src/main/java/Static2.java

@@ -41,8 +41,8 @@ public final class Static2 {
 			@Pc(23) Component local23 = arg0[local11];
 			if (local23 != null) {
 				if (local23.anInt452 == 0) {
-					if (local23.aClass13Array3 != null) {
+					if (local23.createdComponents != null) {
-						method7(local23.aClass13Array3, arg1);
+						method7(local23.createdComponents, arg1);
 					}
 					@Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local23.anInt507);
 					if (local49 != null) {
@@ -53,19 +53,19 @@ public final class Static2 {
 				if (arg1 == 0 && local23.anObjectArray12 != null) {
 					local72 = new HookRequest();
 					local72.anObjectArray31 = local23.anObjectArray12;
-					local72.aClass13_17 = local23;
+					local72.source = local23;
 					Static82.method1767(local72);
 				}
 				if (arg1 == 1 && local23.anObjectArray8 != null) {
-					if (local23.anInt457 >= 0) {
+					if (local23.componentId >= 0) {
-						@Pc(103) Component local103 = Static5.method32(local23.anInt507);
+						@Pc(103) Component local103 = Static5.getComponent(local23.anInt507);
-						if (local103 == null || local103.aClass13Array3 == null || local23.anInt457 >= local103.aClass13Array3.length || local103.aClass13Array3[local23.anInt457] != local23) {
+						if (local103 == null || local103.createdComponents == null || local23.componentId >= local103.createdComponents.length || local103.createdComponents[local23.componentId] != local23) {
 							continue;
 						}
 					}
 					local72 = new HookRequest();
 					local72.anObjectArray31 = local23.anObjectArray8;
-					local72.aClass13_17 = local23;
+					local72.source = local23;
 					Static82.method1767(local72);
 				}
 			}
@@ -92,7 +92,7 @@ public final class Static2 {
 		@Pc(61) int local61 = 0;
 		@Pc(64) int local64 = local53 + 1;
 		Static84.anIntArray209[0] = arg3;
-		@Pc(71) int[][] local71 = Static148.aClass97Array1[Static55.anInt1735].anIntArrayArray30;
+		@Pc(71) int[][] local71 = Static148.aClass97Array1[Static55.level].anIntArrayArray30;
 		@Pc(193) int local193;
 		while (local61 != local64) {
 			local3 = Static259.anIntArray514[local61];
@@ -103,16 +103,16 @@ public final class Static2 {
 				break;
 			}
 			if (arg1 != 0) {
-				if ((arg1 < 5 || arg1 == 10) && Static148.aClass97Array1[Static55.anInt1735].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) {
+				if ((arg1 < 5 || arg1 == 10) && Static148.aClass97Array1[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) {
 					local59 = true;
 					break;
 				}
-				if (arg1 < 10 && Static148.aClass97Array1[Static55.anInt1735].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) {
+				if (arg1 < 10 && Static148.aClass97Array1[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) {
 					local59 = true;
 					break;
 				}
 			}
-			if (arg0 != 0 && arg6 != 0 && Static148.aClass97Array1[Static55.anInt1735].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) {
+			if (arg0 != 0 && arg6 != 0 && Static148.aClass97Array1[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) {
 				local59 = true;
 				break;
 			}
@@ -250,9 +250,9 @@ public final class Static2 {
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IZI)V")
 	public static void method10(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		Static6.aClass3_Sub15_Sub1_1.method2242(132);
+		Static6.outboundBuffer.p1isaac(132);
-		Static6.aClass3_Sub15_Sub1_1.p4rme(arg1);
+		Static6.outboundBuffer.p4rme(arg1);
-		Static6.aClass3_Sub15_Sub1_1.p2le(arg0);
+		Static6.outboundBuffer.p2le(arg0);
 	}
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V")
@@ -279,22 +279,22 @@ public final class Static2 {
 				arg0.anInt477 = Static158.anInt3851;
 			}
 		} else if (local16 == 327) {
-			arg0.anInt450 = 150;
+			arg0.modelXAngle = 150;
-			arg0.anInt524 = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF;
+			arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF;
-			arg0.anInt464 = 5;
+			arg0.modelType = 5;
-			arg0.anInt463 = -1;
+			arg0.modelId = -1;
 		} else if (local16 == 328) {
-			if (Static173.aClass8_Sub4_Sub1_2.aClass100_364 == null) {
+			if (Static173.self.aClass100_364 == null) {
-				arg0.anInt463 = 0;
+				arg0.modelId = 0;
 			} else {
-				arg0.anInt450 = 150;
+				arg0.modelXAngle = 150;
-				arg0.anInt524 = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF;
+				arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF;
-				arg0.anInt464 = 5;
+				arg0.modelType = 5;
-				arg0.anInt463 = ((int) Static173.aClass8_Sub4_Sub1_2.aClass100_364.method3158() << 11) + 2047;
+				arg0.modelId = ((int) Static173.self.aClass100_364.method3158() << 11) + 2047;
-				arg0.anInt496 = Static173.aClass8_Sub4_Sub1_2.anInt3388;
+				arg0.anInt496 = Static173.self.anInt3388;
 				arg0.anInt500 = 0;
-				arg0.anInt522 = Static173.aClass8_Sub4_Sub1_2.anInt3366;
+				arg0.anInt522 = Static173.self.anInt3366;
-				arg0.anInt510 = Static173.aClass8_Sub4_Sub1_2.anInt3407;
+				arg0.anInt510 = Static173.self.anInt3407;
 			}
 		}
 	}

client/src/main/java/Static201.java

@@ -24,13 +24,13 @@ public final class Static201 {
 
 	@OriginalMember(owner = "client!qf", name = "a", descriptor = "(BII)Lclient!be;")
 	public static Component method1418(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(7) Component local7 = Static5.method32(arg0);
+		@Pc(7) Component local7 = Static5.getComponent(arg0);
 		if (arg1 == -1) {
 			return local7;
-		} else if (local7 == null || local7.aClass13Array3 == null || local7.aClass13Array3.length <= arg1) {
+		} else if (local7 == null || local7.createdComponents == null || local7.createdComponents.length <= arg1) {
 			return null;
 		} else {
-			return local7.aClass13Array3[arg1];
+			return local7.createdComponents[arg1];
 		}
 	}
 }

client/src/main/java/Static203.java

@@ -63,7 +63,7 @@ public final class Static203 {
 		} else {
 			Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
 		}
-		if (Static154.anInt3711 != -1) {
+		if (Static154.topLevelInterace != -1) {
 			Static210.method3712(true);
 		}
 		Static139.method2704();
@@ -78,7 +78,7 @@ public final class Static203 {
 				Static231.method3983(1L);
 			}
 			if (local16.status == 1) {
-				local11 = (FileOnDisk) local16.anObject6;
+				local11 = (FileOnDisk) local16.result;
 				@Pc(39) Buffer local39 = Static48.method1196();
 				local11.method5134(local39.data, local39.offset, 0);
 			}

client/src/main/java/Static205.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static205 {
 
 	@OriginalMember(owner = "client!qj", name = "i", descriptor = "[I")
-	public static final int[] anIntArray426 = new int[128];
+	public static final int[] keyChars = new int[128];
 
 	@OriginalMember(owner = "client!qj", name = "a", descriptor = "(Lclient!be;BI)Lclient!na;")
 	public static JagString method3677(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1) {

client/src/main/java/Static207.java

@@ -109,23 +109,23 @@ public final class Static207 {
 				if (Static72.aClass212_3.status != 1) {
 					return -1;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
-				Static6.aClass3_Sub15_Sub1_1.offset = 0;
+				Static6.outboundBuffer.offset = 0;
 				Static72.aClass212_3 = null;
 				local82 = 0;
 				if (Static61.aBoolean109) {
 					local82 = Static80.anInt4702;
 				}
-				Static6.aClass3_Sub15_Sub1_1.p1(255);
+				Static6.outboundBuffer.p1(255);
-				Static6.aClass3_Sub15_Sub1_1.p4(local82);
+				Static6.outboundBuffer.p4(local82);
-				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				local124 = Static124.aClass95_2.read();
+				local124 = Static124.socket.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -138,12 +138,12 @@ public final class Static207 {
 				Static82.anInt2231 = 2;
 			}
 			if (Static82.anInt2231 == 2) {
-				if (Static124.aClass95_2.available() < 2) {
+				if (Static124.socket.available() < 2) {
 					return -1;
 				}
-				Static116.anInt2961 = Static124.aClass95_2.read();
+				Static116.anInt2961 = Static124.socket.read();
 				Static116.anInt2961 <<= 0x8;
-				Static116.anInt2961 += Static124.aClass95_2.read();
+				Static116.anInt2961 += Static124.socket.read();
 				Static82.anInt2231 = 3;
 				Static141.anInt3469 = 0;
 				Static229.aByteArray70 = new byte[Static116.anInt2961];
@@ -151,14 +151,14 @@ public final class Static207 {
 			if (Static82.anInt2231 != 3) {
 				return -1;
 			}
-			local82 = Static124.aClass95_2.available();
+			local82 = Static124.socket.available();
 			if (local82 < 1) {
 				return -1;
 			}
 			if (local82 > Static116.anInt2961 - Static141.anInt3469) {
 				local82 = Static116.anInt2961 - Static141.anInt3469;
 			}
-			Static124.aClass95_2.method2827(Static141.anInt3469, local82, Static229.aByteArray70);
+			Static124.socket.method2827(Static141.anInt3469, local82, Static229.aByteArray70);
 			Static141.anInt3469 += local82;
 			if (Static141.anInt3469 < Static116.anInt2961) {
 				return -1;
@@ -171,8 +171,8 @@ public final class Static207 {
 						Static101.aClass10_Sub1Array1[local124++] = local247;
 					}
 				}
-				Static124.aClass95_2.method2834();
+				Static124.socket.method2834();
-				Static124.aClass95_2 = null;
+				Static124.socket = null;
 				Static127.anInt3132 = 0;
 				Static82.anInt2231 = 0;
 				Static229.aByteArray70 = null;

client/src/main/java/Static209.java

@@ -11,7 +11,7 @@ public final class Static209 {
 	public static Js5 aClass153_86;
 
 	@OriginalMember(owner = "client!ra", name = "J", descriptor = "I")
-	public static int anInt4808 = 0;
+	public static int miscTransmitAt = 0;
 
 	@OriginalMember(owner = "client!ra", name = "R", descriptor = "Z")
 	public static boolean aBoolean240 = true;
@@ -53,8 +53,8 @@ public final class Static209 {
 	public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
 		@Pc(12) DelayedStateChange local12 = Static238.method4143(9, arg0);
 		local12.method1017();
-		local12.anInt1271 = arg2;
+		local12.intArg1 = arg2;
-		local12.anInt1270 = arg1;
+		local12.intArg3 = arg1;
 	}
 
 	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(IBILclient!ve;)[Lclient!qf;")

client/src/main/java/Static210.java

@@ -21,7 +21,7 @@ public final class Static210 {
 
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(ZB)V")
 	public static void method3712(@OriginalArg(0) boolean arg0) {
-		Static234.method4017(Static254.anInt5554, arg0, Static154.anInt3711, Static48.anInt1448);
+		Static234.method4017(Static254.anInt5554, arg0, Static154.topLevelInterace, Static48.anInt1448);
 	}
 
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;")

client/src/main/java/Static214.java

@@ -29,7 +29,7 @@ public final class Static214 {
 	public static void method4359(@OriginalArg(0) Player arg0) {
 		@Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.method3863(arg0.aClass100_364.method3158());
 		if (local12 == null) {
-			Static122.method2411(arg0.anIntArray317[0], null, 0, null, arg0.anIntArray318[0], Static55.anInt1735, arg0);
+			Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Static55.level, arg0);
 		} else {
 			local12.method1567();
 		}

client/src/main/java/Static216.java

@@ -22,9 +22,9 @@ public final class Static216 {
 		}
 		try {
 			if (++Static92.anInt2430 > 2000) {
-				if (Static124.aClass95_2 != null) {
+				if (Static124.socket != null) {
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 				}
 				if (Static276.anInt5816 >= 1) {
 					Static266.anInt5336 = -5;
@@ -51,21 +51,21 @@ public final class Static216 {
 				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
+				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, Static71.signLink);
 				Static72.aClass212_3 = null;
 				@Pc(106) long local106 = Static101.aLong98 = Static186.aClass100_829.method3158();
-				Static6.aClass3_Sub15_Sub1_1.offset = 0;
+				Static6.outboundBuffer.offset = 0;
-				Static6.aClass3_Sub15_Sub1_1.p1(14);
+				Static6.outboundBuffer.p1(14);
 				@Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL);
-				Static6.aClass3_Sub15_Sub1_1.p1(local120);
+				Static6.outboundBuffer.p1(local120);
-				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, 2);
+				Static124.socket.write(Static6.outboundBuffer.data, 2);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				@Pc(150) int local150 = Static124.aClass95_2.read();
+				@Pc(150) int local150 = Static124.socket.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -75,40 +75,40 @@ public final class Static216 {
 				if (local150 != 0) {
 					Static266.anInt5336 = local150;
 					Static184.anInt4348 = 0;
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 					return;
 				}
 				Static184.anInt4348 = 3;
 			}
 			if (Static184.anInt4348 == 3) {
-				if (Static124.aClass95_2.available() < 8) {
+				if (Static124.socket.available() < 8) {
 					return;
 				}
-				Static124.aClass95_2.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data);
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
 				Static193.aLong147 = Static57.aClass3_Sub15_Sub1_3.g8();
 				@Pc(210) int[] local210 = new int[4];
-				Static6.aClass3_Sub15_Sub1_1.offset = 0;
+				Static6.outboundBuffer.offset = 0;
 				local210[2] = (int) (Static193.aLong147 >> 32);
 				local210[3] = (int) Static193.aLong147;
 				local210[1] = (int) (Math.random() * 9.9999999E7D);
 				local210[0] = (int) (Math.random() * 9.9999999E7D);
-				Static6.aClass3_Sub15_Sub1_1.p1(10);
+				Static6.outboundBuffer.p1(10);
-				Static6.aClass3_Sub15_Sub1_1.p4(local210[0]);
+				Static6.outboundBuffer.p4(local210[0]);
-				Static6.aClass3_Sub15_Sub1_1.p4(local210[1]);
+				Static6.outboundBuffer.p4(local210[1]);
-				Static6.aClass3_Sub15_Sub1_1.p4(local210[2]);
+				Static6.outboundBuffer.p4(local210[2]);
-				Static6.aClass3_Sub15_Sub1_1.p4(local210[3]);
+				Static6.outboundBuffer.p4(local210[3]);
-				Static6.aClass3_Sub15_Sub1_1.p8(Static186.aClass100_829.method3158());
+				Static6.outboundBuffer.p8(Static186.aClass100_829.method3158());
-				Static6.aClass3_Sub15_Sub1_1.pjstr(Static186.aClass100_828);
+				Static6.outboundBuffer.pjstr(Static186.aClass100_828);
-				Static6.aClass3_Sub15_Sub1_1.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2);
+				Static6.outboundBuffer.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2);
 				Static17.aClass3_Sub15_Sub1_2.offset = 0;
 				if (Static244.anInt5370 == 40) {
 					Static17.aClass3_Sub15_Sub1_2.p1(18);
 				} else {
 					Static17.aClass3_Sub15_Sub1_2.p1(16);
 				}
-				Static17.aClass3_Sub15_Sub1_2.p2(Static6.aClass3_Sub15_Sub1_1.offset + Static229.method3937(Static47.aClass100_991) + 159);
+				Static17.aClass3_Sub15_Sub1_2.p2(Static6.outboundBuffer.offset + Static229.method3937(Static47.aClass100_991) + 159);
 				Static17.aClass3_Sub15_Sub1_2.p4(530);
 				Static17.aClass3_Sub15_Sub1_2.p1(Static5.anInt39);
 				Static17.aClass3_Sub15_Sub1_2.p1(Static249.aBoolean282 ? 1 : 0);
@@ -121,7 +121,7 @@ public final class Static216 {
 				Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991);
 				Static17.aClass3_Sub15_Sub1_2.p4(Static204.anInt4760);
 				Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746());
-				Static18.aBoolean39 = true;
+				Static18.sentToServer = true;
 				Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443);
 				Static17.aClass3_Sub15_Sub1_2.p4(Static213.aClass153_88.method4480());
 				Static17.aClass3_Sub15_Sub1_2.p4(Static249.aClass153_100.method4480());
@@ -151,9 +151,9 @@ public final class Static216 {
 				Static17.aClass3_Sub15_Sub1_2.p4(Static28.aClass153_18.method4480());
 				Static17.aClass3_Sub15_Sub1_2.p4(Static167.aClass153_63.method4480());
 				Static17.aClass3_Sub15_Sub1_2.p4(Static226.aClass153_93.method4480());
-				Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
-				Static124.aClass95_2.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset);
+				Static124.socket.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset);
-				Static6.aClass3_Sub15_Sub1_1.method2240(local210);
+				Static6.outboundBuffer.method2240(local210);
 				for (@Pc(583) int local583 = 0; local583 < 4; local583++) {
 					local210[local583] += 50;
 				}
@@ -161,10 +161,10 @@ public final class Static216 {
 				Static184.anInt4348 = 4;
 			}
 			if (Static184.anInt4348 == 4) {
-				if (Static124.aClass95_2.available() < 1) {
+				if (Static124.socket.available() < 1) {
 					return;
 				}
-				@Pc(623) int local623 = Static124.aClass95_2.read();
+				@Pc(623) int local623 = Static124.socket.read();
 				if (local623 == 21) {
 					Static184.anInt4348 = 7;
 				} else if (local623 == 29) {
@@ -183,59 +183,59 @@ public final class Static216 {
 					Static184.anInt4348 = 1;
 					Static276.anInt5816++;
 					Static92.anInt2430 = 0;
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 					return;
 				} else {
 					Static266.anInt5336 = local623;
 					Static184.anInt4348 = 0;
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 					return;
 				}
 			}
 			if (Static184.anInt4348 == 6) {
-				Static6.aClass3_Sub15_Sub1_1.offset = 0;
+				Static6.outboundBuffer.offset = 0;
-				Static6.aClass3_Sub15_Sub1_1.method2242(17);
+				Static6.outboundBuffer.p1isaac(17);
-				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
 				Static184.anInt4348 = 4;
 				return;
 			}
 			if (Static184.anInt4348 == 7) {
-				if (Static124.aClass95_2.available() >= 1) {
+				if (Static124.socket.available() >= 1) {
-					Static231.anInt5202 = (Static124.aClass95_2.read() + 3) * 60;
+					Static231.anInt5202 = (Static124.socket.read() + 3) * 60;
 					Static184.anInt4348 = 0;
 					Static266.anInt5336 = 21;
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 					return;
 				}
 				return;
 			}
 			if (Static184.anInt4348 == 10) {
-				if (Static124.aClass95_2.available() >= 1) {
+				if (Static124.socket.available() >= 1) {
-					Static204.anInt4765 = Static124.aClass95_2.read();
+					Static204.anInt4765 = Static124.socket.read();
 					Static184.anInt4348 = 0;
 					Static266.anInt5336 = 29;
-					Static124.aClass95_2.method2834();
+					Static124.socket.method2834();
-					Static124.aClass95_2 = null;
+					Static124.socket = null;
 					return;
 				}
 				return;
 			}
 			if (Static184.anInt4348 == 8) {
-				if (Static124.aClass95_2.available() < 14) {
+				if (Static124.socket.available() < 14) {
 					return;
 				}
-				Static124.aClass95_2.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data);
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
-				Static191.anInt4502 = Static57.aClass3_Sub15_Sub1_3.g1();
+				Static191.staffModLevel = Static57.aClass3_Sub15_Sub1_3.g1();
 				Static249.anInt5431 = Static57.aClass3_Sub15_Sub1_3.g1();
 				Static124.aBoolean157 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
 				Static207.aBoolean236 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
 				Static25.aBoolean57 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
 				Static86.aBoolean129 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
-				Static245.aBoolean281 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
+				Static245.enabled = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
 				Static16.anInt549 = Static57.aClass3_Sub15_Sub1_3.g2();
 				Static202.aBoolean233 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
 				Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
@@ -259,11 +259,11 @@ public final class Static216 {
 				Static184.anInt4348 = 9;
 			}
 			if (Static184.anInt4348 == 9) {
-				if (Static124.aClass95_2.available() < Static223.anInt5028) {
+				if (Static124.socket.available() < Static223.anInt5028) {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
-				Static124.aClass95_2.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
 				Static266.anInt5336 = 2;
 				Static184.anInt4348 = 0;
 				Static243.method4221();
@@ -273,9 +273,9 @@ public final class Static216 {
 				return;
 			}
 		} catch (@Pc(977) IOException local977) {
-			if (Static124.aClass95_2 != null) {
+			if (Static124.socket != null) {
-				Static124.aClass95_2.method2834();
+				Static124.socket.method2834();
-				Static124.aClass95_2 = null;
+				Static124.socket = null;
 			}
 			if (Static276.anInt5816 >= 1) {
 				Static184.anInt4348 = 0;

client/src/main/java/Static217.java

@@ -24,17 +24,17 @@ public final class Static217 {
 
 	@OriginalMember(owner = "client!rj", name = "a", descriptor = "(IIILclient!e;I)V")
 	public static void method3767(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2, @OriginalArg(4) int arg3) {
-		if (Static173.aClass8_Sub4_Sub1_2 == arg2 || Static231.anInt5204 >= 400) {
+		if (Static173.self == arg2 || Static231.anInt5204 >= 400) {
 			return;
 		}
 		@Pc(158) JagString local158;
 		if (arg2.anInt1671 == 0) {
 			@Pc(22) boolean local22 = true;
-			if (Static173.aClass8_Sub4_Sub1_2.anInt1667 != -1 && arg2.anInt1667 != -1) {
+			if (Static173.self.anInt1667 != -1 && arg2.anInt1667 != -1) {
-				@Pc(43) int local43 = arg2.anInt1652 < Static173.aClass8_Sub4_Sub1_2.anInt1652 ? Static173.aClass8_Sub4_Sub1_2.anInt1652 : arg2.anInt1652;
+				@Pc(43) int local43 = arg2.anInt1652 < Static173.self.anInt1652 ? Static173.self.anInt1652 : arg2.anInt1652;
-				@Pc(58) int local58 = Static173.aClass8_Sub4_Sub1_2.anInt1667 < arg2.anInt1667 ? Static173.aClass8_Sub4_Sub1_2.anInt1667 : arg2.anInt1667;
+				@Pc(58) int local58 = Static173.self.anInt1667 < arg2.anInt1667 ? Static173.self.anInt1667 : arg2.anInt1667;
 				@Pc(69) int local69 = local43 * 10 / 100 + local58 + 5;
-				@Pc(76) int local76 = Static173.aClass8_Sub4_Sub1_2.anInt1652 - arg2.anInt1652;
+				@Pc(76) int local76 = Static173.self.anInt1652 - arg2.anInt1652;
 				if (local76 < 0) {
 					local76 = -local76;
 				}
@@ -44,9 +44,9 @@ public final class Static217 {
 			}
 			@Pc(95) JagString local95 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
 			if (arg2.anInt1652 < arg2.anInt1656) {
-				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.aClass8_Sub4_Sub1_2.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static78.aClass100_465, Static123.method2423(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
+				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static78.aClass100_465, Static123.method2423(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
 			} else {
-				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.aClass8_Sub4_Sub1_2.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static72.aClass100_448 });
+				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static72.aClass100_448 });
 			}
 		} else {
 			local158 = Static34.method882(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.method2423(arg2.anInt1671), Static72.aClass100_448 });
@@ -59,11 +59,11 @@ public final class Static217 {
 				if (Static160.aClass100Array121[local275] != null) {
 					@Pc(291) short local291 = 0;
 					if (Static266.game == 0 && Static160.aClass100Array121[local275].method3111(LocalizedText.ATTACK)) {
-						if (arg2.anInt1652 > Static173.aClass8_Sub4_Sub1_2.anInt1652) {
+						if (arg2.anInt1652 > Static173.self.anInt1652) {
 							local291 = 2000;
 						}
-						if (Static173.aClass8_Sub4_Sub1_2.anInt1650 != 0 && arg2.anInt1650 != 0) {
+						if (Static173.self.anInt1650 != 0 && arg2.anInt1650 != 0) {
-							if (Static173.aClass8_Sub4_Sub1_2.anInt1650 == arg2.anInt1650) {
+							if (Static173.self.anInt1650 == arg2.anInt1650) {
 								local291 = 2000;
 							} else {
 								local291 = 0;

client/src/main/java/Static220.java

@@ -18,9 +18,9 @@ public final class Static220 {
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V")
 	public static void method3797(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.anInt1735][arg1][arg0];
+		@Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.level][arg1][arg0];
 		if (local9 == null) {
-			Static187.method3420(Static55.anInt1735, arg1, arg0);
+			Static187.method3420(Static55.level, arg1, arg0);
 			return;
 		}
 		@Pc(28) int local28 = -99999999;
@@ -38,7 +38,7 @@ public final class Static220 {
 			}
 		}
 		if (local30 == null) {
-			Static187.method3420(Static55.anInt1735, arg1, arg0);
+			Static187.method3420(Static55.level, arg1, arg0);
 			return;
 		}
 		local9.method2283(local30);
@@ -56,7 +56,7 @@ public final class Static220 {
 			}
 		}
 		@Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736);
-		Static69.method1543(Static55.anInt1735, arg1, arg0, Static207.method3685(Static55.anInt1735, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91);
+		Static69.method1543(Static55.level, arg1, arg0, Static207.method3685(Static55.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91);
 	}
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(JB)V")
@@ -90,18 +90,18 @@ public final class Static220 {
 		@Pc(94) int local94;
 		if (Static239.aBoolean269) {
 			@Pc(68) GlModel local68 = (GlModel) local10;
-			if (arg5 != Static207.method3685(Static55.anInt1735, arg3 + local42, arg1 + local48) || arg5 != Static207.method3685(Static55.anInt1735, arg3 + local45, local51 + arg1)) {
+			if (arg5 != Static207.method3685(Static55.level, arg3 + local42, arg1 + local48) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) {
 				for (local94 = 0; local94 < local68.anInt5295; local94++) {
-					local68.anIntArray465[local94] += Static207.method3685(Static55.anInt1735, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5;
+					local68.anIntArray465[local94] += Static207.method3685(Static55.level, local68.anIntArray461[local94] + arg3, local68.anIntArray466[local94] + arg1) - arg5;
 				}
 				local68.aClass127_4.aBoolean235 = false;
 				local68.aClass5_1.aBoolean3 = false;
 			}
 		} else {
 			@Pc(142) SoftwareModel local142 = (SoftwareModel) local10;
-			if (arg5 != Static207.method3685(Static55.anInt1735, local42 + arg3, local48 + arg1) || arg5 != Static207.method3685(Static55.anInt1735, arg3 + local45, local51 + arg1)) {
+			if (arg5 != Static207.method3685(Static55.level, local42 + arg3, local48 + arg1) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) {
 				for (local94 = 0; local94 < local142.anInt5788; local94++) {
-					local142.anIntArray527[local94] += Static207.method3685(Static55.anInt1735, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5;
+					local142.anIntArray527[local94] += Static207.method3685(Static55.level, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5;
 				}
 				local142.aBoolean305 = false;
 			}

client/src/main/java/Static225.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static225 {
 
 	@OriginalMember(owner = "client!se", name = "a", descriptor = "I")
-	public static int anInt5068;
+	public static int originX;
 
 	@OriginalMember(owner = "client!se", name = "l", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_92;
@@ -53,7 +53,7 @@ public final class Static225 {
 					if (local121 > 15) {
 						local121 -= 32;
 					}
-					local65.method1265(local92 + Static173.aClass8_Sub4_Sub1_2.anIntArray318[0], local116 == 1, Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] + local121);
+					local65.method1265(local92 + Static173.self.movementQueueX[0], local116 == 1, Static173.self.movementQueueZ[0] + local121);
 					continue;
 				}
 			}
@@ -74,7 +74,7 @@ public final class Static225 {
 	public static void method3893(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(5, arg0);
 		local14.method1017();
-		local14.anInt1271 = arg1;
+		local14.intArg1 = arg1;
 	}
 
 	@OriginalMember(owner = "client!se", name = "a", descriptor = "(Lclient!na;Lclient!na;IB)V")
@@ -98,10 +98,10 @@ public final class Static225 {
 			local43.pjstr(Static186.aClass100_828);
 			local43.p4((int) (Math.random() * 9.9999999E7D));
 			local43.encryptRsa(Static86.aBigInteger1, Static256.aBigInteger2);
-			Static6.aClass3_Sub15_Sub1_1.offset = 0;
+			Static6.outboundBuffer.offset = 0;
-			Static6.aClass3_Sub15_Sub1_1.p1(210);
+			Static6.outboundBuffer.p1(210);
-			Static6.aClass3_Sub15_Sub1_1.p1(local43.offset);
+			Static6.outboundBuffer.p1(local43.offset);
-			Static6.aClass3_Sub15_Sub1_1.pBytes(local43.data, local43.offset);
+			Static6.outboundBuffer.pBytes(local43.data, local43.offset);
 		} else {
 			Static49.method1208();
 		}

client/src/main/java/Static226.java

@@ -23,7 +23,7 @@ public final class Static226 {
 	public static final JagString aClass100_965 = Static28.parse("<col=ffff00>");
 
 	@OriginalMember(owner = "client!sf", name = "h", descriptor = "[Lclient!na;")
-	public static final JagString[] aClass100Array154 = new JagString[1000];
+	public static final JagString[] varcstrs = new JagString[1000];
 
 	@OriginalMember(owner = "client!sf", name = "i", descriptor = "I")
 	public static int anInt5084 = 0;
@@ -97,7 +97,7 @@ public final class Static226 {
 				Static60.aBoolean108 = true;
 				Static24.anInt761 = local16;
 			}
-		} else if (Static155.anInt3751 == Static7.anInt985 && Static60.anInt1892 == Static60.anInt1893) {
+		} else if (Static155.anInt3751 == Static7.clickX && Static60.anInt1892 == Static60.clickY) {
 			Static183.anInt4271 = local27;
 			Static162.anInt3953 = 0;
 			Static24.anInt761 = local16;
@@ -105,8 +105,8 @@ public final class Static226 {
 			Static13.anInt436 = (Static261.aBoolean298 ? 26 : 22) + Static231.anInt5204 * 15;
 			Static60.aBoolean108 = true;
 		} else {
-			Static280.anInt5895 = Static60.anInt1893;
+			Static280.anInt5895 = Static60.clickY;
-			Static277.anInt5850 = Static7.anInt985;
+			Static277.anInt5850 = Static7.clickX;
 			Static162.anInt3953 = 1;
 		}
 	}

client/src/main/java/Static227.java

@@ -27,7 +27,7 @@ public final class Static227 {
 	public static final JagString aClass100_966 = Static28.parse("settings");
 
 	@OriginalMember(owner = "client!sg", name = "q", descriptor = "[I")
-	public static final int[] anIntArray447 = new int[128];
+	public static final int[] keyCodes = new int[128];
 
 	@OriginalMember(owner = "client!sg", name = "a", descriptor = "(B)V")
 	public static void method3903() {

client/src/main/java/Static229.java

@@ -50,6 +50,6 @@ public final class Static229 {
 	public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(16) DelayedStateChange local16 = Static238.method4143(12, arg1);
 		local16.method1017();
-		local16.anInt1271 = arg0;
+		local16.intArg1 = arg0;
 	}
 }

client/src/main/java/Static233.java

@@ -50,7 +50,7 @@ public final class Static233 {
 	public static final JagString aClass100_994 = Static28.parse(")3");
 
 	@OriginalMember(owner = "client!t", name = "E", descriptor = "[I")
-	public static final int[] anIntArray452 = new int[32];
+	public static final int[] updatedVarcstrs = new int[32];
 
 	@OriginalMember(owner = "client!t", name = "F", descriptor = "I")
 	public static int js5PrevErrors = 0;
@@ -67,7 +67,7 @@ public final class Static233 {
 		while (local5.length > local3) {
 			@Pc(17) Class102 local17 = local5[local3];
 			if (local17 != null && local17.anInt4058 == 2) {
-				Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.anInt3483 << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.anInt5068 << 7), arg3);
+				Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.anInt4053 - Static225.originX << 7), arg3);
 				if (Static65.anInt1951 > -1 && Static83.anInt372 % 20 < 10) {
 					Static276.aClass3_Sub2_Sub1Array11[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
 				}
@@ -139,19 +139,19 @@ public final class Static233 {
 			if (local24 != 0) {
 				local73 = (local73 << local24 & 0xF) + (local73 >> 4 - local24);
 			}
-			Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, local59, true, local73, arg2, local62, 0, 2, arg1, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
+			Static102.method2075(Static173.self.movementQueueZ[0], 0, local59, true, local73, arg2, local62, 0, 2, arg1, Static173.self.movementQueueX[0]);
 		} else {
-			Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
+			Static102.method2075(Static173.self.movementQueueZ[0], local24, 0, true, 0, arg2, 0, local12 + 1, 2, arg1, Static173.self.movementQueueX[0]);
 		}
-		Static25.anInt826 = Static60.anInt1893;
+		Static25.y = Static60.clickY;
-		Static17.anInt577 = 0;
+		Static17.milliseconds = 0;
-		Static70.anInt2013 = 2;
+		Static70.type = 2;
-		Static122.anInt3047 = Static7.anInt985;
+		Static122.x = Static7.clickX;
 		return true;
 	}
 
 	@OriginalMember(owner = "client!t", name = "a", descriptor = "(Lclient!i;II)V")
-	public static void method4005(@OriginalArg(0) Packet arg0) {
+	public static void loop(@OriginalArg(0) Packet arg0) {
 		while (true) {
 			@Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.method2289();
 			if (local18 == null) {
@@ -180,7 +180,7 @@ public final class Static233 {
 			if (local23) {
 				return;
 			}
-			arg0.method2242(163);
+			arg0.p1isaac(163);
 			arg0.p1(0);
 			local25 = arg0.offset;
 			arg0.p4(local18.anInt1732);
@@ -191,23 +191,23 @@ public final class Static233 {
 						@Pc(168) Field local168;
 						@Pc(195) int local195;
 						if (local151 == 0) {
-							local168 = (Field) local18.aClass212Array2[local121].anObject6;
+							local168 = (Field) local18.aClass212Array2[local121].result;
 							local195 = local168.getInt(null);
 							arg0.p1(0);
 							arg0.p4(local195);
 						} else if (local151 == 1) {
-							local168 = (Field) local18.aClass212Array2[local121].anObject6;
+							local168 = (Field) local18.aClass212Array2[local121].result;
 							local168.setInt(null, local18.anIntArray137[local121]);
 							arg0.p1(0);
 						} else if (local151 == 2) {
-							local168 = (Field) local18.aClass212Array2[local121].anObject6;
+							local168 = (Field) local18.aClass212Array2[local121].result;
 							local195 = local168.getModifiers();
 							arg0.p1(0);
 							arg0.p4(local195);
 						}
 						@Pc(234) Method local234;
 						if (local151 == 3) {
-							local234 = (Method) local18.aClass212Array1[local121].anObject6;
+							local234 = (Method) local18.aClass212Array1[local121].result;
 							@Pc(239) byte[][] local239 = local18.aByteArrayArrayArray6[local121];
 							@Pc(243) Object[] local243 = new Object[local239.length];
 							for (@Pc(245) int local245 = 0; local245 < local239.length; local245++) {
@@ -227,7 +227,7 @@ public final class Static233 {
 								arg0.p1(4);
 							}
 						} else if (local151 == 4) {
-							local234 = (Method) local18.aClass212Array1[local121].anObject6;
+							local234 = (Method) local18.aClass212Array1[local121].result;
 							local195 = local234.getModifiers();
 							arg0.p1(0);
 							arg0.p4(local195);

client/src/main/java/Static234.java

@@ -92,7 +92,7 @@ public final class Static234 {
 				local14.method2692(local14.aClass96_1.anInt3713);
 				local14.anInt3365 = local14.aClass96_1.anInt3737;
 				if (local14.aClass96_1.method2935()) {
-					Static122.method2411(local14.anIntArray317[0], null, 0, local14, local14.anIntArray318[0], Static55.anInt1735, null);
+					Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Static55.level, null);
 				}
 			}
 			if ((local18 & 0x20) != 0) {
@@ -135,8 +135,8 @@ public final class Static234 {
 
 	@OriginalMember(owner = "client!ta", name = "a", descriptor = "(IZIII)V")
 	public static void method4017(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
-		if (Static245.method4225(arg2)) {
+		if (Static245.load(arg2)) {
-			Static266.method4190(-1, arg1, arg3, arg0, Static241.aClass13ArrayArray12[arg2]);
+			Static266.method4190(-1, arg1, arg3, arg0, Static241.components[arg2]);
 		}
 	}
 

client/src/main/java/Static235.java

@@ -15,7 +15,7 @@ public final class Static235 {
 
 	@OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I")
 	public static int method4044() {
-		return Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1];
+		return Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1];
 	}
 
 	@OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;")

client/src/main/java/Static236.java

@@ -29,10 +29,10 @@ public final class Static236 {
 		@Pc(139) int local139;
 		if (Static22.anInt723 != 0) {
 			if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) {
-				arg2.anInt468 -= 4;
+				arg2.scrollY -= 4;
 				Static43.method1143(arg2);
 			} else if (arg3 >= arg4 && arg3 < arg4 + 16 && arg0 >= arg1 + arg5 - 16 && arg1 + arg5 > arg0) {
-				arg2.anInt468 += 4;
+				arg2.scrollY += 4;
 				Static43.method1143(arg2);
 			} else if (arg3 >= arg4 - Static42.anInt1396 && arg3 < arg4 + Static42.anInt1396 + 16 && arg0 >= arg5 + 16 && arg1 + arg5 - 16 > arg0) {
 				local139 = arg1 * (arg1 - 32) / arg6;
@@ -41,17 +41,17 @@ public final class Static236 {
 				}
 				@Pc(150) int local150 = arg1 - local139 - 32;
 				@Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16;
-				arg2.anInt468 = (arg6 - arg1) * local162 / local150;
+				arg2.scrollY = (arg6 - arg1) * local162 / local150;
 				Static43.method1143(arg2);
 				Static45.aBoolean84 = true;
 			}
 		}
-		if (Static58.anInt1766 == 0) {
+		if (Static58.wheelRotation == 0) {
 			return;
 		}
 		local139 = arg2.anInt445;
 		if (arg4 - local139 <= arg3 && arg5 <= arg0 && arg3 < arg4 + 16 && arg1 + arg5 >= arg0) {
-			arg2.anInt468 += Static58.anInt1766 * 45;
+			arg2.scrollY += Static58.wheelRotation * 45;
 			Static43.method1143(arg2);
 		}
 	}

client/src/main/java/Static24.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static24 {
 
 	@OriginalMember(owner = "client!bn", name = "N", descriptor = "Lclient!be;")
-	public static Component aClass13_8;
+	public static Component component;
 
 	@OriginalMember(owner = "client!bn", name = "O", descriptor = "I")
 	public static int anInt761;

client/src/main/java/Static241.java

@@ -8,7 +8,7 @@ public final class Static241 {
 	public static IndexedSprite[] aClass36Array16;
 
 	@OriginalMember(owner = "client!th", name = "j", descriptor = "[[Lclient!be;")
-	public static Component[][] aClass13ArrayArray12;
+	public static Component[][] components;
 
 	@OriginalMember(owner = "client!th", name = "m", descriptor = "[Lclient!be;")
 	public static Component[] aClass13Array13;

client/src/main/java/Static243.java

@@ -39,17 +39,17 @@ public final class Static243 {
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Z)V")
 	public static void method4221() {
 		Static204.anInt4762 = 0;
-		Static67.aBoolean168 = true;
+		Static67.prevFocus = true;
-		Static183.aLong139 = 0L;
+		Static183.prevClickTime = 0L;
-		Static178.aClass74_1.anInt2990 = 0;
+		Static178.instance.samples = 0;
-		Static26.aBoolean59 = true;
+		Static26.focus = true;
 		Static114.method4625();
 		Static49.anInt1462 = -1;
 		Static5.anInt45 = -1;
 		Static164.anInt3985 = -1;
 		Static267.anInt5775 = 0;
-		Static60.anInt1894 = 0;
+		Static60.rebootTimer = 0;
-		Static6.aClass3_Sub15_Sub1_1.offset = 0;
+		Static6.outboundBuffer.offset = 0;
 		Static230.anInt5152 = -1;
 		Static201.anInt1862 = 0;
 		Static57.aClass3_Sub15_Sub1_3.offset = 0;
@@ -59,7 +59,7 @@ public final class Static243 {
 		}
 		Static231.anInt5204 = 0;
 		Static60.aBoolean108 = false;
-		Static48.method1197(0);
+		Static48.setIdleLoops(0);
 		for (local3506 = 0; local3506 < 100; local3506++) {
 			Static230.aClass100Array158[local3506] = null;
 		}
@@ -86,7 +86,7 @@ public final class Static243 {
 		for (local3506 = 0; local3506 < 32768; local3506++) {
 			Static175.aClass8_Sub4_Sub2Array1[local3506] = null;
 		}
-		Static173.aClass8_Sub4_Sub1_2 = Static159.aClass8_Sub4_Sub1Array1[2047] = new Player();
+		Static173.self = Static159.aClass8_Sub4_Sub1Array1[2047] = new Player();
 		Static217.aClass69_116.method2278();
 		Static99.aClass69_64.method2278();
 		if (Static159.aClass69ArrayArrayArray1 != null) {
@@ -113,16 +113,16 @@ public final class Static243 {
 		Static251.anInt5449 = 0;
 		Static113.anInt4612 = 0;
 		Static233.anInt5225 = 0;
-		for (local3506 = 0; local3506 < Static155.anIntArray355.length; local3506++) {
+		for (local3506 = 0; local3506 < Static155.varcs.length; local3506++) {
-			Static155.anIntArray355[local3506] = -1;
+			Static155.varcs[local3506] = -1;
 		}
-		if (Static154.anInt3711 != -1) {
+		if (Static154.topLevelInterace != -1) {
-			Static109.method2275(Static154.anInt3711);
+			Static109.method2275(Static154.topLevelInterace);
 		}
 		for (@Pc(3755) Class3_Sub31 local3755 = (Class3_Sub31) Static119.aClass133_9.method3859(); local3755 != null; local3755 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
 			Static132.method2605(true, local3755);
 		}
-		Static154.anInt3711 = -1;
+		Static154.topLevelInterace = -1;
 		Static119.aClass133_9 = new HashTable(8);
 		Static52.method1287();
 		Static39.aClass13_10 = null;

client/src/main/java/Static245.java

@@ -11,7 +11,7 @@ public final class Static245 {
 	public static final JagString aClass100_1018 = Static28.parse("; Expires=Thu)1 01)2Jan)21970 00:00:00 GMT; Max)2Age=0");
 
 	@OriginalMember(owner = "client!tm", name = "e", descriptor = "Z")
-	public static boolean aBoolean281 = false;
+	public static boolean enabled = false;
 
 	@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
 	public static int anInt5377 = 0;
@@ -23,7 +23,7 @@ public final class Static245 {
 	}
 
 	@OriginalMember(owner = "client!tm", name = "b", descriptor = "(II)Z")
-	public static boolean method4225(@OriginalArg(0) int arg0) {
+	public static boolean load(@OriginalArg(0) int arg0) {
 		if (Static223.aBooleanArray115[arg0]) {
 			return true;
 		} else if (Static202.aClass153_84.method4479(arg0)) {
@@ -32,14 +32,14 @@ public final class Static245 {
 				Static223.aBooleanArray115[arg0] = true;
 				return true;
 			}
-			if (Static241.aClass13ArrayArray12[arg0] == null) {
+			if (Static241.components[arg0] == null) {
-				Static241.aClass13ArrayArray12[arg0] = new Component[local25];
+				Static241.components[arg0] = new Component[local25];
 			}
 			for (@Pc(46) int local46 = 0; local46 < local25; local46++) {
-				if (Static241.aClass13ArrayArray12[arg0][local46] == null) {
+				if (Static241.components[arg0][local46] == null) {
 					@Pc(62) byte[] local62 = Static202.aClass153_84.method4495(arg0, local46);
 					if (local62 != null) {
-						@Pc(74) Component local74 = Static241.aClass13ArrayArray12[arg0][local46] = new Component();
+						@Pc(74) Component local74 = Static241.components[arg0][local46] = new Component();
 						local74.anInt507 = local46 + (arg0 << 16);
 						if (local62[0] == -1) {
 							local74.method490(new Buffer(local62));

client/src/main/java/Static246.java

@@ -23,7 +23,7 @@ public final class Static246 {
 	public static void method4239() {
 		for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.method2289(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.method2288()) {
 			@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
-			if (local15.anInt606 != Static55.anInt1735 || local15.aBoolean41) {
+			if (local15.anInt606 != Static55.level || local15.aBoolean41) {
 				local9.method4658();
 			} else if (local15.anInt590 <= Static83.anInt372) {
 				local15.method558(Static178.anInt4247);
@@ -50,7 +50,7 @@ public final class Static246 {
 		@Pc(35) JagString local35 = arg0.aClass100_738;
 		if (arg0.anInt3726 != 0) {
 			@Pc(47) JagString local47 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
-			local35 = Static34.method882(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.aClass8_Sub4_Sub1_2.anInt1652), Static123.aClass100_593, local47, Static123.method2423(arg0.anInt3726), Static72.aClass100_448 });
+			local35 = Static34.method882(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.method2423(arg0.anInt3726), Static72.aClass100_448 });
 		}
 		if (Static260.anInt5014 == 1) {
 			Static98.method1966(Static169.anInt4075, (long) arg2, Static34.method882(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
@@ -99,7 +99,7 @@ public final class Static246 {
 				for (local140 = 4; local140 >= 0; local140--) {
 					if (local129[local140] != null && local129[local140].method3111(LocalizedText.ATTACK)) {
 						@Pc(271) short local271 = 0;
-						if (arg0.anInt3726 > Static173.aClass8_Sub4_Sub1_2.anInt1652) {
+						if (arg0.anInt3726 > Static173.self.anInt1652) {
 							local271 = 2000;
 						}
 						@Pc(281) short local281 = 0;

client/src/main/java/Static247.java

@@ -663,7 +663,7 @@ public final class Static247 {
 		@Pc(8) Component local8 = Static201.method1418(arg0, arg1);
 		if (local8 != null && local8.anObjectArray11 != null) {
 			@Pc(19) HookRequest local19 = new HookRequest();
-			local19.aClass13_17 = local8;
+			local19.source = local8;
 			local19.anObjectArray31 = local8.anObjectArray11;
 			Static82.method1767(local19);
 		}

client/src/main/java/Static248.java

@@ -20,7 +20,7 @@ public final class Static248 {
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(IB)Z")
 	public static boolean method3288(@OriginalArg(0) int arg0) {
 		Static189.anInt4443 = arg0 + 1 & 0xFFFF;
-		Static34.aBoolean65 = true;
+		Static34.verifyIdChanged = true;
 		return true;
 	}
 

client/src/main/java/Static25.java

@@ -12,20 +12,20 @@ public final class Static25 {
 	public static final JagString aClass100_154 = Static28.parse("Mem:");
 
 	@OriginalMember(owner = "client!c", name = "eb", descriptor = "I")
-	public static int anInt826 = 0;
+	public static int y = 0;
 
 	@OriginalMember(owner = "client!c", name = "hb", descriptor = "Z")
 	public static boolean aBoolean57 = false;
 
 	@OriginalMember(owner = "client!c", name = "d", descriptor = "(I)Z")
-	public static boolean method712() {
+	public static boolean nextKey() {
 		@Pc(6) Keyboard local6 = Static10.aClass149_1;
 		synchronized (Static10.aClass149_1) {
 			if (Static228.anInt5105 == Static102.anInt2678) {
 				return false;
 			} else {
-				Static102.anInt2681 = Static221.anIntArray375[Static102.anInt2678];
+				Static102.keyCode = Static221.anIntArray375[Static102.anInt2678];
-				Static193.anInt4542 = Static264.anIntArray413[Static102.anInt2678];
+				Static193.keyChar = Static264.anIntArray413[Static102.anInt2678];
 				Static102.anInt2678 = Static102.anInt2678 + 1 & 0x7F;
 				return true;
 			}

client/src/main/java/Static250.java

@@ -35,8 +35,8 @@ public final class Static250 {
 
 	@OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V")
 	public static void method4273() {
-		@Pc(14) int local14 = Static173.aClass8_Sub4_Sub1_2.anInt3412 + Static132.anInt3291;
+		@Pc(14) int local14 = Static173.self.anInt3412 + Static132.anInt3291;
-		@Pc(20) int local20 = Static173.aClass8_Sub4_Sub1_2.anInt3421 + Static206.anInt4774;
+		@Pc(20) int local20 = Static173.self.anInt3421 + Static206.anInt4774;
 		if (Static81.anInt2223 - local14 < -500 || Static81.anInt2223 - local14 > 500 || Static111.anInt2900 - local20 < -500 || Static111.anInt2900 - local20 > 500) {
 			Static81.anInt2223 = local14;
 			Static111.anInt2900 = local20;
@@ -48,8 +48,8 @@ public final class Static250 {
 			Static81.anInt2223 += (local14 - Static81.anInt2223) / 16;
 		}
 		if (Static33.aBoolean63) {
-			for (@Pc(93) int local93 = 0; local93 < Static182.anInt4313; local93++) {
+			for (@Pc(93) int local93 = 0; local93 < Static182.keyQueueSize; local93++) {
-				@Pc(104) int local104 = Static227.anIntArray447[local93];
+				@Pc(104) int local104 = Static227.keyCodes[local93];
 				if (local104 == 98) {
 					Static72.anInt2031 = Static72.anInt2031 + 47 & 0xFFFFFFF0;
 				} else if (local104 == 99) {
@@ -61,16 +61,16 @@ public final class Static250 {
 				}
 			}
 		} else {
-			if (Static187.aBooleanArray101[98]) {
+			if (Static187.pressedKeys[98]) {
 				Static56.anInt1743 += (12 - Static56.anInt1743) / 2;
-			} else if (Static187.aBooleanArray101[99]) {
+			} else if (Static187.pressedKeys[99]) {
 				Static56.anInt1743 += (-Static56.anInt1743 - 12) / 2;
 			} else {
 				Static56.anInt1743 /= 2;
 			}
-			if (Static187.aBooleanArray101[96]) {
+			if (Static187.pressedKeys[96]) {
 				Static38.anInt1203 += (-Static38.anInt1203 - 24) / 2;
-			} else if (Static187.aBooleanArray101[97]) {
+			} else if (Static187.pressedKeys[97]) {
 				Static38.anInt1203 += (24 - Static38.anInt1203) / 2;
 			} else {
 				Static38.anInt1203 /= 2;

client/src/main/java/Static251.java

@@ -29,7 +29,7 @@ public final class Static251 {
 	public static int anInt5459 = 0;
 
 	@OriginalMember(owner = "client!ug", name = "a", descriptor = "(B)V")
-	public static void method4274() {
+	public static void loop() {
 		for (@Pc(10) Class3_Sub7 local10 = (Class3_Sub7) Static26.aClass69_27.method2289(); local10 != null; local10 = (Class3_Sub7) Static26.aClass69_27.method2288()) {
 			if (local10.anInt924 > 0) {
 				local10.anInt924--;

client/src/main/java/Static252.java

@@ -31,7 +31,7 @@ public final class Static252 {
 				Static266.aByteArrayArrayArray15[local33][local31][local40] = local27;
 			}
 		}
-		if (Static55.anInt1735 == 3) {
+		if (Static55.level == 3) {
 			return;
 		}
 		for (local33 = 0; local33 < 2; local33++) {
@@ -42,19 +42,19 @@ public final class Static252 {
 			Static50.anIntArray134[local33] = 0;
 		}
 		if (Static227.anInt5096 != 1) {
-			local33 = Static207.method3685(Static55.anInt1735, Static138.anInt3439, Static134.anInt3302);
+			local33 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302);
-			if (local33 - Static5.anInt40 < 800 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][Static138.anInt3439 >> 7][Static134.anInt3302 >> 7] & 0x4) != 0) {
+			if (local33 - Static5.anInt40 < 800 && (Static12.aByteArrayArrayArray2[Static55.level][Static138.anInt3439 >> 7][Static134.anInt3302 >> 7] & 0x4) != 0) {
 				Static254.method4348(false, Static138.anInt3439 >> 7, Static134.anInt3302 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 			}
 			return;
 		}
-		if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7][Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7] & 0x4) != 0) {
+		if ((Static12.aByteArrayArrayArray2[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) {
-			Static254.method4348(false, Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7, Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0);
+			Static254.method4348(false, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0);
 		}
 		if (Static240.anInt5333 >= 310) {
 			return;
 		}
-		@Pc(135) int local135 = Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7;
+		@Pc(135) int local135 = Static173.self.anInt3421 >> 7;
 		local40 = Static134.anInt3302 >> 7;
 		@Pc(146) int local146;
 		if (local40 < local135) {
@@ -63,7 +63,7 @@ public final class Static252 {
 			local146 = local40 - local135;
 		}
 		local33 = Static138.anInt3439 >> 7;
-		@Pc(162) int local162 = Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7;
+		@Pc(162) int local162 = Static173.self.anInt3412 >> 7;
 		@Pc(174) int local174;
 		if (local162 > local33) {
 			local174 = local162 - local33;
@@ -81,7 +81,7 @@ public final class Static252 {
 				} else if (local40 > local135) {
 					local40--;
 				}
-				if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) {
+				if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) {
 					Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 					break;
 				}
@@ -93,7 +93,7 @@ public final class Static252 {
 						local33--;
 					}
 					local186 -= 65536;
-					if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) {
+					if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) {
 						Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 						break;
 					}
@@ -109,7 +109,7 @@ public final class Static252 {
 			} else if (local33 > local162) {
 				local33--;
 			}
-			if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) {
+			if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) {
 				Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 				break;
 			}
@@ -121,7 +121,7 @@ public final class Static252 {
 					local40--;
 				}
 				local186 -= 65536;
-				if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local33][local40] & 0x4) != 0) {
+				if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) {
 					Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 					break;
 				}

client/src/main/java/Static253.java

@@ -54,7 +54,7 @@ public final class Static253 {
 			if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) {
 				local59 = Static276.anIntArray564[4] + 128;
 			}
-			Static18.method555(Static81.anInt2223, arg0, Static207.method3685(Static55.anInt1735, Static173.aClass8_Sub4_Sub1_2.anInt3412, Static173.aClass8_Sub4_Sub1_2.anInt3421) - 50, 600 - -(local59 * 3), local57, Static111.anInt2900, local59);
+			Static18.method555(Static81.anInt2223, arg0, Static207.method3685(Static55.level, Static173.self.anInt3412, Static173.self.anInt3421) - 50, 600 - -(local59 * 3), local57, Static111.anInt2900, local59);
 		}
 		local57 = Static5.anInt40;
 		local59 = Static138.anInt3439;
@@ -125,13 +125,13 @@ public final class Static253 {
 			if (Static244.anInt5370 == 10) {
 				local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.anInt4609, Static138.anInt3439 >> 10);
 			} else {
-				local171 = Static103.method2235(Static178.anInt4247, Static173.aClass8_Sub4_Sub1_2.anIntArray317[0] >> 3, Static113.anInt4609, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0] >> 3);
+				local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.anInt4609, Static173.self.movementQueueX[0] >> 3);
 			}
 			Static120.method2394(Static83.anInt372, !Static11.aBoolean15);
 			Static239.method4176(local171);
 			Static143.method2731(Static240.anInt5333, Static134.anInt3302, Static5.anInt40, Static138.anInt3439, Static184.anInt4358);
 			Static239.anInt5323 = Static83.anInt372;
-			Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.anInt1735 + 1, local387, Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7, Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7);
+			Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7);
 			Static263.aBoolean299 = true;
 			Static120.method2390();
 			Static143.method2731(0, 0, 0, 0, 0);
@@ -141,7 +141,7 @@ public final class Static253 {
 			Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4);
 		} else {
 			Static129.method2495(arg2, arg4, arg3, arg0, 0);
-			Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.anInt1735 + 1, local387, Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7, Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7);
+			Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7);
 			Static107.method2261();
 			Static223.method3858();
 			Static142.method2726(arg4, arg3, arg2, 256, arg0, 256);

client/src/main/java/Static254.java

@@ -45,9 +45,9 @@ public final class Static254 {
 	@OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z")
 	public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) {
 		@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF);
-		if (local14 == Static266.aByteArrayArrayArray15[Static55.anInt1735][arg1][arg2]) {
+		if (local14 == Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2]) {
 			return false;
-		} else if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][arg1][arg2] & 0x4) == 0) {
+		} else if ((Static12.aByteArrayArrayArray2[Static55.level][arg1][arg2] & 0x4) == 0) {
 			return false;
 		} else {
 			@Pc(47) int local47 = 0;
@@ -55,7 +55,7 @@ public final class Static254 {
 			Static259.anIntArray514[0] = arg1;
 			@Pc(69) int local69 = local49 + 1;
 			Static84.anIntArray209[0] = arg2;
-			Static266.aByteArrayArrayArray15[Static55.anInt1735][arg1][arg2] = local14;
+			Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2] = local14;
 			while (local47 != local69) {
 				@Pc(94) int local94 = Static259.anIntArray514[local47] >> 16 & 0xFF;
 				@Pc(102) int local102 = Static259.anIntArray514[local47] >> 24 & 0xFF;
@@ -65,12 +65,12 @@ public final class Static254 {
 				local47 = local47 + 1 & 0xFFF;
 				@Pc(130) boolean local130 = false;
 				@Pc(132) boolean local132 = false;
-				if ((Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0) {
+				if ((Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0) {
 					local130 = true;
 				}
 				@Pc(150) int local150;
 				@Pc(191) int local191;
-				label238: for (local150 = Static55.anInt1735 + 1; local150 <= 3; local150++) {
+				label238: for (local150 = Static55.level + 1; local150 <= 3; local150++) {
 					if ((Static12.aByteArrayArrayArray2[local150][local108][local122] & 0x8) == 0) {
 						@Pc(227) int local227;
 						@Pc(358) int local358;
@@ -125,8 +125,8 @@ public final class Static254 {
 					}
 				}
 				if (local132) {
-					if (Static83.anIntArrayArrayArray4[Static55.anInt1735 + 1][local108][local122] > Static79.anIntArray205[arg4]) {
+					if (Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
-						Static79.anIntArray205[arg4] = Static83.anIntArrayArrayArray4[Static55.anInt1735 + 1][local108][local122];
+						Static79.anIntArray205[arg4] = Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122];
 					}
 					local150 = local108 << 7;
 					if (local150 < Static149.anIntArray338[arg4]) {
@@ -142,58 +142,58 @@ public final class Static254 {
 					}
 				}
 				if (!local130) {
-					if (local108 >= 1 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] != local14) {
+					if (local108 >= 1 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14) {
 						Static259.anIntArray514[local69] = local108 - 1 | 0x120000 | 0xD3000000;
 						Static84.anIntArray209[local69] = local122 | 0x130000;
 						local69 = local69 + 1 & 0xFFF;
-						Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] = local14;
+						Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
 					}
 					local122++;
 					if (local122 < 104) {
-						if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 - 1][local122 - 1] & 0x4) == 0) {
+						if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = 0x52000000 | 0x120000 | local108 - 1;
 							Static84.anIntArray209[local69] = local122 | 0x130000;
-							Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] = local14;
+							Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
 							local69 = local69 + 1 & 0xFFF;
 						}
-						if (local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122]) {
+						if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) {
 							Static259.anIntArray514[local69] = local108 | 0x13000000 | 0x520000;
 							Static84.anIntArray209[local69] = local122 | 0x530000;
 							local69 = local69 + 1 & 0xFFF;
-							Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122] = local14;
+							Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14;
 						}
-						if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 + 1][local122 - 1] & 0x4) == 0) {
+						if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = 0x92000000 | 0x520000 | local108 + 1;
 							Static84.anIntArray209[local69] = local122 | 0x530000;
-							Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] = local14;
+							Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
 							local69 = local69 + 1 & 0xFFF;
 						}
 					}
 					local122--;
-					if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122]) {
+					if (local108 + 1 < 104 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122]) {
 						Static259.anIntArray514[local69] = local108 + 1 | 0x920000 | 0x53000000;
 						Static84.anIntArray209[local69] = local122 | 0x930000;
-						Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] = local14;
+						Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
 						local69 = local69 + 1 & 0xFFF;
 					}
 					local122--;
 					if (local122 >= 0) {
-						if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 - 1][local122 + 1] & 0x4) == 0) {
+						if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = local108 - 1 | 0xD20000 | 0x12000000;
 							Static84.anIntArray209[local69] = local122 | 0xD30000;
-							Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 - 1][local122] = local14;
+							Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
 							local69 = local69 + 1 & 0xFFF;
 						}
-						if (local14 != Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122]) {
+						if (local14 != Static266.aByteArrayArrayArray15[Static55.level][local108][local122]) {
 							Static259.anIntArray514[local69] = local108 | 0xD20000 | 0x93000000;
 							Static84.anIntArray209[local69] = local122 | 0xD30000;
 							local69 = local69 + 1 & 0xFFF;
-							Static266.aByteArrayArrayArray15[Static55.anInt1735][local108][local122] = local14;
+							Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14;
 						}
-						if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.anInt1735][local108 + 1][local122 + 1] & 0x4) == 0) {
+						if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0 && (Static12.aByteArrayArrayArray2[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = local108 + 1 | 0xD2000000 | 0x920000;
 							Static84.anIntArray209[local69] = local122 | 0x930000;
-							Static266.aByteArrayArrayArray15[Static55.anInt1735][local108 + 1][local122] = local14;
+							Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
 							local69 = local69 + 1 & 0xFFF;
 						}
 					}

client/src/main/java/Static256.java

@@ -14,8 +14,8 @@ public final class Static256 {
 	@OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
 	public static void method4392() {
 		Static11.anInt384 = 0;
-		@Pc(17) int local17 = Static225.anInt5068 + (Static173.aClass8_Sub4_Sub1_2.anInt3412 >> 7);
+		@Pc(17) int local17 = Static225.originX + (Static173.self.anInt3412 >> 7);
-		@Pc(25) int local25 = (Static173.aClass8_Sub4_Sub1_2.anInt3421 >> 7) + Static142.anInt3483;
+		@Pc(25) int local25 = (Static173.self.anInt3421 >> 7) + Static142.originZ;
 		if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
 			Static11.anInt384 = 1;
 		}

client/src/main/java/Static258.java

@@ -47,7 +47,7 @@ public final class Static258 {
 		if (arg2.anInt452 == 2) {
 			local171 = 0;
 			for (local173 = 0; local173 < arg2.anInt488; local173++) {
-				for (@Pc(183) int local183 = 0; local183 < arg2.anInt446; local183++) {
+				for (@Pc(183) int local183 = 0; local183 < arg2.baseWidth; local183++) {
 					@Pc(195) int local195 = (arg2.anInt512 + 32) * local183;
 					@Pc(202) int local202 = (arg2.anInt516 + 32) * local173;
 					if (local171 < 20) {
@@ -57,9 +57,9 @@ public final class Static258 {
 					if (arg1 >= local195 && local202 <= arg0 && local195 + 32 > arg1 && local202 + 32 > arg0) {
 						Static169.aClass13_18 = arg2;
 						Static18.anInt588 = local171;
-						if (arg2.anIntArray40[local171] > 0) {
+						if (arg2.objTypes[local171] > 0) {
 							@Pc(267) ServerActiveProperties local267 = Static36.method940(arg2);
-							@Pc(276) ObjType local276 = Static71.method1439(arg2.anIntArray40[local171] - 1);
+							@Pc(276) ObjType local276 = Static71.method1439(arg2.objTypes[local171] - 1);
 							if (Static260.anInt5014 == 1 && local267.method510()) {
 								if (Static224.anInt5062 != arg2.anInt507 || Static185.anInt4370 != local171) {
 									Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 40, LocalizedText.USE, arg2.anInt507);
@@ -150,24 +150,24 @@ public final class Static258 {
 			for (local171 = 9; local171 >= 5; local171--) {
 				@Pc(765) JagString local765 = Static205.method3677(arg2, local171);
 				if (local765 != null) {
-					Static98.method1966(Static8.method118(local171, arg2), (long) (local171 + 1), arg2.aClass100_88, arg2.anInt457, (short) 1003, local765, arg2.anInt507);
+					Static98.method1966(Static8.method118(local171, arg2), (long) (local171 + 1), arg2.aClass100_88, arg2.componentId, (short) 1003, local765, arg2.anInt507);
 				}
 			}
 			local47 = Static97.method1963(arg2);
 			if (local47 != null) {
-				Static98.method1966(-1, 0L, arg2.aClass100_88, arg2.anInt457, (short) 32, local47, arg2.anInt507);
+				Static98.method1966(-1, 0L, arg2.aClass100_88, arg2.componentId, (short) 32, local47, arg2.anInt507);
 			}
 			for (local173 = 4; local173 >= 0; local173--) {
 				@Pc(828) JagString local828 = Static205.method3677(arg2, local173);
 				if (local828 != null) {
-					Static98.method1966(Static8.method118(local173, arg2), (long) (local173 + 1), arg2.aClass100_88, arg2.anInt457, (short) 9, local828, arg2.anInt507);
+					Static98.method1966(Static8.method118(local173, arg2), (long) (local173 + 1), arg2.aClass100_88, arg2.componentId, (short) 9, local828, arg2.anInt507);
 				}
 			}
 			if (Static36.method940(arg2).method506()) {
-				Static98.method1966(-1, 0L, Static186.aClass100_827, arg2.anInt457, (short) 41, LocalizedText.CONTINUE, arg2.anInt507);
+				Static98.method1966(-1, 0L, Static186.aClass100_827, arg2.componentId, (short) 41, LocalizedText.CONTINUE, arg2.anInt507);
 			}
 		} else if (Static36.method940(arg2).method508() && (Static274.anInt4999 & 0x20) != 0) {
-			Static98.method1966(Static246.anInt5393, 0L, Static34.method882(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.anInt457, (short) 12, Static102.aClass100_545, arg2.anInt507);
+			Static98.method1966(Static246.anInt5393, 0L, Static34.method882(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.componentId, (short) 12, Static102.aClass100_545, arg2.anInt507);
 		}
 	}
 

client/src/main/java/Static26.java

@@ -11,7 +11,7 @@ public final class Static26 {
 	public static Js5 aClass153_16;
 
 	@OriginalMember(owner = "client!ca", name = "ab", descriptor = "Z")
-	public static boolean aBoolean59;
+	public static boolean focus;
 
 	@OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;")
 	public static LinkedList aClass69_27 = new LinkedList();
@@ -30,8 +30,8 @@ public final class Static26 {
 
 	@OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
 	public static void method740() {
-		@Pc(10) int local10 = (Static138.anInt3439 >> 10) + (Static225.anInt5068 >> 3);
+		@Pc(10) int local10 = (Static138.anInt3439 >> 10) + (Static225.originX >> 3);
-		@Pc(23) int local23 = (Static134.anInt3302 >> 10) + (Static142.anInt3483 >> 3);
+		@Pc(23) int local23 = (Static134.anInt3302 >> 10) + (Static142.originZ >> 3);
 		Static156.aByteArrayArray11 = new byte[18][];
 		Static35.anIntArray82 = new int[18];
 		Static191.aByteArrayArray15 = new byte[18][];
@@ -92,8 +92,8 @@ public final class Static26 {
 		for (@Pc(25) int local25 = 0; local25 < local13; local25++) {
 			@Pc(32) byte[] local32 = local19[local25];
 			if (local32 != null) {
-				@Pc(45) int local45 = (Static238.anIntArray470[local25] >> 8) * 64 - Static225.anInt5068;
+				@Pc(45) int local45 = (Static238.anIntArray470[local25] >> 8) * 64 - Static225.originX;
-				@Pc(56) int local56 = (Static238.anIntArray470[local25] & 0xFF) * 64 - Static142.anInt3483;
+				@Pc(56) int local56 = (Static238.anIntArray470[local25] & 0xFF) * 64 - Static142.originZ;
 				Static107.method2261();
 				Static124.method2437(local45, arg0, local32, local56, Static148.aClass97Array1);
 			}

client/src/main/java/Static260.java

@@ -29,7 +29,7 @@ public final class Static260 {
 		if (Static233.anInt5217 >= 100) {
 			@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
 			@Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
-			@Pc(44) int local44 = Static207.method3685(Static55.anInt1735, local30, local36) - Static57.anInt1744;
+			@Pc(44) int local44 = Static207.method3685(Static55.level, local30, local36) - Static57.anInt1744;
 			@Pc(49) int local49 = local44 - Static5.anInt40;
 			@Pc(54) int local54 = local30 - Static138.anInt3439;
 			@Pc(59) int local59 = local36 - Static134.anInt3302;