Lots of login/js5/cs2 refactoring, rename Class3_Sub14 to GlTile

client/src/main/java/AnimFrameset.java

@@ -16,7 +16,7 @@ public final class AnimFrameset extends SecondaryNode {
 		this.aClass104Array1 = new AnimFrame[local10];
 		@Pc(19) int[] local19 = arg0.method4503(arg2);
 		for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) {
-			@Pc(37) byte[] local37 = arg0.method4495(arg2, local19[local21]);
+			@Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]);
 			@Pc(51) int local51 = local37[1] & 0xFF | (local37[0] & 0xFF) << 8;
 			@Pc(56) AnimBase local56 = (AnimBase) local5.method2289();
 			@Pc(58) AnimBase local58 = null;

client/src/main/java/Class165.java

@@ -22,7 +22,7 @@ public final class Class165 {
 	private GlVertexBufferObject aClass155_7;
 
 	@OriginalMember(owner = "client!wm", name = "b", descriptor = "Z")
-	public boolean aBoolean313 = true;
+	public boolean outputToSprite = true;
 
 	@OriginalMember(owner = "client!wm", name = "h", descriptor = "I")
 	private int anInt5902 = -1;

client/src/main/java/ClientScript.java

@@ -14,7 +14,7 @@ public final class ClientScript extends SecondaryNode {
 	public int anInt4669;
 
 	@OriginalMember(owner = "client!qc", name = "O", descriptor = "[I")
-	public int[] anIntArray415;
+	public int[] opcodes;
 
 	@OriginalMember(owner = "client!qc", name = "Q", descriptor = "[Lclient!sc;")
 	public HashTable[] aClass133Array1;
@@ -26,8 +26,8 @@ public final class ClientScript extends SecondaryNode {
 	public int anInt4671;
 
 	@OriginalMember(owner = "client!qc", name = "T", descriptor = "[Lclient!na;")
-	public JagString[] aClass100Array140;
+	public JagString[] stringOperands;
 
 	@OriginalMember(owner = "client!qc", name = "W", descriptor = "[I")
-	public int[] anIntArray416;
+	public int[] intOperands;
 }

client/src/main/java/CollisionMap.java

@@ -28,7 +28,7 @@ public final class CollisionMap {
 		this.anInt3912 = 0;
 		this.anInt3899 = arg0;
 		this.anIntArrayArray30 = new int[this.anInt3899][this.anInt3904];
-		this.method3050();
+		this.resetFlags();
 	}
 
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IZIIII)V")
@@ -759,7 +759,7 @@ public final class CollisionMap {
 	}
 
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(I)V")
-	public final void method3050() {
+	public final void resetFlags() {
 		for (@Pc(3) int local3 = 0; local3 < this.anInt3899; local3++) {
 			for (@Pc(13) int local13 = 0; local13 < this.anInt3904; local13++) {
 				if (local3 == 0 || local13 == 0 || local3 >= this.anInt3899 - 5 || this.anInt3904 - 5 <= local13) {
@@ -772,7 +772,7 @@ public final class CollisionMap {
 	}
 
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(III)V")
-	public final void method3051(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public final void addRangeableFlag(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(12) int local12 = arg0 - this.anInt3907;
 		@Pc(17) int local17 = arg1 - this.anInt3912;
 		this.anIntArrayArray30[local17][local12] |= 0x200000;

client/src/main/java/GlTile.java

@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!hg")
-public final class Class3_Sub14 extends Node {
+public final class GlTile extends Node {
 
 	@OriginalMember(owner = "client!hg", name = "s", descriptor = "Ljava/nio/ByteBuffer;")
 	private ByteBuffer aByteBuffer3;
@@ -94,7 +94,7 @@ public final class Class3_Sub14 extends Node {
 	public final int anInt2486;
 
 	@OriginalMember(owner = "client!hg", name = "<init>", descriptor = "(IFZZI)V")
-	public Class3_Sub14(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4) {
+	public GlTile(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4) {
 		this.anInt2485 = arg0;
 		this.aFloat12 = arg1;
 		this.aBoolean140 = arg2;

client/src/main/java/GoSubFrame.java

@@ -5,14 +5,14 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class GoSubFrame {
 
 	@OriginalMember(owner = "client!hj", name = "b", descriptor = "[I")
-	public int[] anIntArray237;
+	public int[] intLocals;
 
 	@OriginalMember(owner = "client!hj", name = "f", descriptor = "[Lclient!na;")
-	public JagString[] aClass100Array79;
+	public JagString[] stringLocals;
 
 	@OriginalMember(owner = "client!hj", name = "h", descriptor = "Lclient!qc;")
-	public ClientScript aClass3_Sub2_Sub17_1;
+	public ClientScript script;
 
 	@OriginalMember(owner = "client!hj", name = "k", descriptor = "I")
-	public int anInt2515 = -1;
+	public int pc = -1;
 }

client/src/main/java/HookRequest.java

@@ -29,7 +29,7 @@ public final class HookRequest extends Node {
 	public int anInt3102;
 
 	@OriginalMember(owner = "client!jl", name = "E", descriptor = "[Ljava/lang/Object;")
-	public Object[] anObjectArray31;
+	public Object[] arguments;
 
 	@OriginalMember(owner = "client!jl", name = "F", descriptor = "Lclient!be;")
 	public Component source;

client/src/main/java/JavaMouseWheel.java

@@ -20,7 +20,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen
 
 	@OriginalMember(owner = "client!o", name = "a", descriptor = "(I)I")
 	@Override
-	public final synchronized int method3287() {
+	public final synchronized int getRotation() {
 		@Pc(2) int local2 = this.anInt4233;
 		this.anInt4233 = 0;
 		return local2;

client/src/main/java/Js5.java

@@ -141,7 +141,7 @@ public final class Js5 {
 		@Pc(28) int local28 = this.aClass70_2.aClass76_1.method2405(local15.method3154());
 		if (this.method4492(local28)) {
 			@Pc(53) int local53 = this.aClass70_2.aClass76Array1[local28].method2405(local19.method3154());
-			return this.method4495(local28, local53);
+			return this.getFile(local28, local53);
 		} else {
 			return null;
 		}
@@ -173,7 +173,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(I[III)[B")
-	public final byte[] method4488(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) int arg2) {
+	public final byte[] getFileXTEA(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) int arg2) {
 		if (!this.method4501(arg0, arg2)) {
 			return null;
 		}
@@ -198,7 +198,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BLclient!na;)Z")
-	public final boolean method4489(@OriginalArg(1) JagString arg0) {
+	public final boolean allFilesComplete(@OriginalArg(1) JagString arg0) {
 		if (this.method4484()) {
 			@Pc(14) JagString local14 = arg0.toLowerCase();
 			@Pc(25) int local25 = this.aClass70_2.aClass76_1.method2405(local14.method3154());
@@ -360,8 +360,8 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(IBI)[B")
-	public final byte[] method4495(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public final byte[] getFile(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		return this.method4488(arg0, null, arg1);
+		return this.getFileXTEA(arg0, null, arg1);
 	}
 
 	@OriginalMember(owner = "client!ve", name = "b", descriptor = "(ZI)V")
@@ -418,11 +418,11 @@ public final class Js5 {
 		if (!this.method4484()) {
 			return null;
 		} else if (this.aClass70_2.anIntArray270.length == 1) {
-			return this.method4495(0, arg0);
+			return this.getFile(0, arg0);
 		} else if (!this.method4492(arg0)) {
 			return null;
 		} else if (this.aClass70_2.anIntArray270[arg0] == 1) {
-			return this.method4495(arg0, 0);
+			return this.getFile(arg0, 0);
 		} else {
 			throw new RuntimeException();
 		}

client/src/main/java/Js5GlTextureProvider.java

@@ -66,7 +66,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
 		} else {
 			this.aClass54_11 = null;
 		}
-		@Pc(51) Buffer local51 = new Buffer(arg1.method4495(0, 0));
+		@Pc(51) Buffer local51 = new Buffer(arg1.getFile(0, 0));
 		@Pc(55) int local55 = local51.g2();
 		this.aByteArray61 = new byte[local55];
 		this.aByteArray60 = new byte[local55];
@@ -167,7 +167,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
 		if (local14 != null) {
 			return local14;
 		}
-		@Pc(30) byte[] local30 = this.aClass153_73.method4495(arg0, 0);
+		@Pc(30) byte[] local30 = this.aClass153_73.getFile(arg0, 0);
 		if (local30 == null) {
 			return null;
 		} else {

client/src/main/java/LinkedList.java

@@ -77,7 +77,7 @@ public final class LinkedList {
 	}
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(B)Lclient!ab;")
-	public final Node method2287() {
+	public final Node removeHead() {
 		@Pc(3) Node local3 = this.aClass3_109.aClass3_222;
 		if (this.aClass3_109 == local3) {
 			return null;

client/src/main/java/Loc.java

@@ -100,7 +100,7 @@ public final class Loc extends Entity {
 				this.anInt1304 = 1;
 			}
 			this.anInt1317 = 1;
-			this.anInt1320 = Static83.anInt372 - 1;
+			this.anInt1320 = Static83.loop - 1;
 			if (this.aClass144_2.anInt5347 == 0 && arg8 != null && arg8 instanceof Loc) {
 				@Pc(142) Loc local142 = (Loc) arg8;
 				if (this.aClass144_2 == local142.aClass144_2) {
@@ -121,7 +121,7 @@ public final class Loc extends Entity {
 					}
 				}
 				this.anInt1317 = (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]) + 1;
-				this.anInt1320 = Static83.anInt372 - this.anInt1317;
+				this.anInt1320 = Static83.loop - this.anInt1317;
 			}
 		}
 		if (GlRenderer.enabled && arg8 != null) {
@@ -174,7 +174,7 @@ public final class Loc extends Entity {
 		if (this.aClass144_2 == null) {
 			return;
 		}
-		@Pc(10) int local10 = Static83.anInt372 - this.anInt1320;
+		@Pc(10) int local10 = Static83.loop - this.anInt1320;
 		if (local10 > 100 && this.aClass144_2.anInt5362 > 0) {
 			@Pc(29) int local29 = this.aClass144_2.anIntArray473.length - this.aClass144_2.anInt5362;
 			while (this.anInt1297 < local29 && this.aClass144_2.anIntArray474[this.anInt1297] < local10) {
@@ -216,12 +216,12 @@ public final class Loc extends Entity {
 			}
 		}
 		this.anInt1317 = local10;
-		this.anInt1320 = Static83.anInt372 - local10;
+		this.anInt1320 = Static83.loop - local10;
 	}
 
 	@OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;")
 	private Entity method1048(@OriginalArg(0) boolean arg0) {
-		@Pc(12) boolean local12 = Static107.anIntArrayArrayArray10 != Static83.anIntArrayArrayArray4;
+		@Pc(12) boolean local12 = Static107.surfaceTileHeightMap != Static83.activeTileHeightMap;
 		@Pc(19) LocType local19 = Static271.method4601(this.anInt1299);
 		@Pc(22) int local22 = local19.anInt4430;
 		if (local19.anIntArray380 != null) {
@@ -250,7 +250,7 @@ public final class Loc extends Entity {
 					this.anInt1320 -= (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]);
 				} else {
 					this.anInt1297 = 0;
-					this.anInt1320 = Static83.anInt372 - 1;
+					this.anInt1320 = Static83.loop - 1;
 				}
 			}
 		}
@@ -273,15 +273,15 @@ public final class Loc extends Entity {
 		if (arg0 && !local256) {
 			return null;
 		}
-		@Pc(267) int[][] local267 = Static83.anIntArrayArrayArray4[this.anInt1303];
+		@Pc(267) int[][] local267 = Static83.activeTileHeightMap[this.anInt1303];
 		@Pc(293) int local293 = local267[local178][local201] + local267[local185][local201] + local267[local185][local192] + local267[local178][local192] >> 2;
 		@Pc(302) int local302 = (local160 << 6) + (this.anInt1308 << 7);
 		@Pc(311) int local311 = (local157 << 6) + (this.anInt1300 << 7);
 		@Pc(314) int[][] local314 = null;
 		if (local12) {
-			local314 = Static107.anIntArrayArrayArray10[0];
+			local314 = Static107.surfaceTileHeightMap[0];
 		} else if (this.anInt1303 < 3) {
-			local314 = Static83.anIntArrayArrayArray4[this.anInt1303 + 1];
+			local314 = Static83.activeTileHeightMap[this.anInt1303 + 1];
 		}
 		if (GlRenderer.enabled && local256) {
 			Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319);
@@ -302,7 +302,7 @@ public final class Loc extends Entity {
 			}
 			@Pc(429) int local429 = 0;
 			if (this.anInt1303 != 0) {
-				@Pc(439) int[][] local439 = Static83.anIntArrayArrayArray4[0];
+				@Pc(439) int[][] local439 = Static83.activeTileHeightMap[0];
 				local429 = local293 - (local439[local178][local192] + local439[local185][local192] + local439[local185][local201] + local439[local178][local201] >> 2);
 			}
 			@Pc(471) SoftwareIndexedSprite local471 = local389.aClass36_Sub1_3;

client/src/main/java/LocType.java

@@ -209,9 +209,9 @@ public final class LocType {
 	public final LocType method3417() {
 		@Pc(26) int local26 = -1;
 		if (this.anInt4425 != -1) {
-			local26 = Static155.method2945(this.anInt4425);
+			local26 = Static155.getVarbit(this.anInt4425);
 		} else if (this.anInt4431 != -1) {
-			local26 = Static7.anIntArray75[this.anInt4431];
+			local26 = Static7.varps[this.anInt4431];
 		}
 		if (local26 < 0 || local26 >= this.anIntArray380.length - 1 || this.anIntArray380[local26] == -1) {
 			@Pc(84) int local84 = this.anIntArray380[this.anIntArray380.length - 1];

client/src/main/java/MouseWheel.java

@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public abstract class MouseWheel {
 
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(I)I")
-	public abstract int method3287();
+	public abstract int getRotation();
 
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(ZLjava/awt/Component;)V")
 	public abstract void method3291(@OriginalArg(1) Component arg0);

client/src/main/java/NpcType.java

@@ -157,9 +157,9 @@ public final class NpcType {
 	public final NpcType method2932() {
 		@Pc(5) int local5 = -1;
 		if (this.anInt3723 != -1) {
-			local5 = Static155.method2945(this.anInt3723);
+			local5 = Static155.getVarbit(this.anInt3723);
 		} else if (this.anInt3749 != -1) {
-			local5 = Static7.anIntArray75[this.anInt3749];
+			local5 = Static7.varps[this.anInt3749];
 		}
 		if (local5 < 0 || local5 >= this.anIntArray357.length - 1 || this.anIntArray357[local5] == -1) {
 			@Pc(55) int local55 = this.anIntArray357[this.anIntArray357.length - 1];
@@ -176,9 +176,9 @@ public final class NpcType {
 		}
 		@Pc(16) int local16 = -1;
 		if (this.anInt3723 != -1) {
-			local16 = Static155.method2945(this.anInt3723);
+			local16 = Static155.getVarbit(this.anInt3723);
 		} else if (this.anInt3749 != -1) {
-			local16 = Static7.anIntArray75[this.anInt3749];
+			local16 = Static7.varps[this.anInt3749];
 		}
 		if (local16 < 0 || local16 >= this.anIntArray357.length - 1 || this.anIntArray357[local16] == -1) {
 			@Pc(62) int local62 = this.anIntArray357[this.anIntArray357.length - 1];

client/src/main/java/Player.java

@@ -262,10 +262,10 @@ public final class Player extends PathingEntity {
 		}
 		@Pc(515) Model local515 = null;
 		if (!this.aBoolean98 && this.anObject5 != null) {
-			if (Static83.anInt372 >= this.anInt3375) {
+			if (Static83.loop >= this.anInt3375) {
 				this.anObject5 = null;
 			}
-			if (this.anInt3390 <= Static83.anInt372 && this.anInt3375 > Static83.anInt372) {
+			if (this.anInt3390 <= Static83.loop && this.anInt3375 > Static83.loop) {
 				if (this.anObject5 instanceof Loc) {
 					local515 = (Model) ((Loc) this.anObject5).method1049();
 				} else {

client/src/main/java/Static1.java

@@ -28,7 +28,7 @@ public final class Static1 {
 	}
 
 	@OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
-	public static Class3_Sub14[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) {
+	public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) {
 		@Pc(10) HashTable local10 = new HashTable(128);
 		@Pc(12) int local12;
 		@Pc(17) int local17;
@@ -63,7 +63,7 @@ public final class Static1 {
 					if (local50.anInt5899 == -1) {
 						continue;
 					}
-					@Pc(61) Class3_Sub14 local61 = Static243.method4212(local10, local50);
+					@Pc(61) GlTile local61 = Static243.method4212(local10, local50);
 					@Pc(67) byte local67 = arg7[local12][local17];
 					@Pc(71) int[] local71 = Static228.anIntArrayArray35[local67];
 					local61.anInt2482 += local71.length / 2;
@@ -238,7 +238,7 @@ public final class Static1 {
 						@Pc(1077) boolean[] local1077 = Static277.aBooleanArrayArray4[local143 == local777 ? local129 : 0];
 						local1086 = Static277.aBooleanArrayArray4[local190 == local777 ? local168 : 0];
 						@Pc(1092) FloType local1092 = Static256.method4395(local777 - 1);
-						@Pc(1097) Class3_Sub14 local1097 = Static243.method4212(local10, local1092);
+						@Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092);
 						local1097.anInt2482 += 5;
 						local1097.anInt2482 += local1077.length - 2;
 						local1097.anInt2482 += local1055.length - 2;
@@ -249,8 +249,8 @@ public final class Static1 {
 				}
 			}
 		}
-		@Pc(1161) Class3_Sub14 local1161;
+		@Pc(1161) GlTile local1161;
-		for (local1161 = (Class3_Sub14) local10.method3859(); local1161 != null; local1161 = (Class3_Sub14) local10.method3861()) {
+		for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) {
 			local1161.method1940();
 		}
 		for (local12 = 1; local12 <= 102; local12++) {
@@ -269,7 +269,7 @@ public final class Static1 {
 					if (local1250.anInt5899 == -1) {
 						continue;
 					}
-					@Pc(1261) Class3_Sub14 local1261 = Static243.method4212(local10, local1250);
+					@Pc(1261) GlTile local1261 = Static243.method4212(local10, local1250);
 					@Pc(1267) byte local1267 = arg7[local12][local17];
 					@Pc(1273) byte local1273 = arg5[local12][local17];
 					local168 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12][local17]);
@@ -469,7 +469,7 @@ public final class Static1 {
 						local1086 = Static277.aBooleanArrayArray4[local2003 == local190 ? local168 : 0];
 						@Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
 						@Pc(2324) FloType local2324 = Static256.method4395(local2003 - 1);
-						@Pc(2329) Class3_Sub14 local2329 = Static243.method4212(local10, local2324);
+						@Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324);
 						@Pc(2345) int local2345 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
 						@Pc(2365) int local2365 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
 						@Pc(2385) int local2385 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
@@ -515,7 +515,7 @@ public final class Static1 {
 				}
 			}
 		}
-		for (local1161 = (Class3_Sub14) local10.method3859(); local1161 != null; local1161 = (Class3_Sub14) local10.method3861()) {
+		for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) {
 			if (local1161.anInt2483 == 0) {
 				local1161.method4658();
 			} else {
@@ -523,7 +523,7 @@ public final class Static1 {
 			}
 		}
 		local12 = local10.method3864();
-		@Pc(2823) Class3_Sub14[] local2823 = new Class3_Sub14[local12];
+		@Pc(2823) GlTile[] local2823 = new GlTile[local12];
 		@Pc(2826) long[] local2826 = new long[local12];
 		local10.method3865(local2823);
 		for (local38 = 0; local38 < local12; local38++) {

client/src/main/java/Static10.java

@@ -84,7 +84,7 @@ public final class Static10 {
 				local61 = local61 + Static57.aClass3_Sub15_Sub1_3.data[local63] + ",";
 			}
 			Static89.report(local61, local19);
-			Static278.method4653();
+			Static278.processLogout();
 			return true;
 		}
 	}

client/src/main/java/Static103.java

@@ -192,7 +192,7 @@ public final class Static103 {
 				} else if (Static102.method2075(Static173.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, Static173.self.movementQueueX[0])) {
 					Static6.outboundBuffer.p1(Static1.anInt5);
 					Static6.outboundBuffer.p1(Static107.anInt2878);
-					Static6.outboundBuffer.p2(Static57.anInt1747);
+					Static6.outboundBuffer.p2(Static57.yawTarget);
 					Static6.outboundBuffer.p1(57);
 					Static6.outboundBuffer.p1(Static59.anInt1814);
 					Static6.outboundBuffer.p1(Static273.anInt4130);
@@ -437,8 +437,8 @@ public final class Static103 {
 			local693 = Static5.getComponent(local19);
 			if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
 				local1955 = local693.anIntArrayArray4[0][1];
-				if (Static7.anIntArray75[local1955] != local693.anIntArray48[0]) {
+				if (Static7.varps[local1955] != local693.anIntArray48[0]) {
-					Static7.anIntArray75[local1955] = local693.anIntArray48[0];
+					Static7.varps[local1955] = local693.anIntArray48[0];
 					Static85.method1775(local1955);
 				}
 			}
@@ -464,7 +464,7 @@ public final class Static103 {
 			local693 = Static5.getComponent(local19);
 			if (local693.anIntArrayArray4 != null && local693.anIntArrayArray4[0][0] == 5) {
 				local1955 = local693.anIntArrayArray4[0][1];
-				Static7.anIntArray75[local1955] = 1 - Static7.anIntArray75[local1955];
+				Static7.varps[local1955] = 1 - Static7.varps[local1955];
 				Static85.method1775(local1955);
 			}
 		}

client/src/main/java/Static105.java

@@ -108,12 +108,12 @@ public final class Static105 {
 
 	@OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z")
 	public static boolean method2256(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) {
-		@Pc(6) boolean local6 = Static83.anIntArrayArrayArray4 == Static80.anIntArrayArrayArray19;
+		@Pc(6) boolean local6 = Static83.activeTileHeightMap == Static80.underWaterTileHeightMap;
 		@Pc(8) int local8 = 0;
 		@Pc(17) int local17;
 		for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) {
 			for (local17 = arg2; local17 < arg2 + arg4; local17++) {
-				if (local10 < 0 || local17 < 0 || local10 >= Static152.anInt3594 || local17 >= Static99.anInt2550) {
+				if (local10 < 0 || local17 < 0 || local10 >= Static152.mapSizeX || local17 >= Static99.mapSizeZ) {
 					return false;
 				}
 				@Pc(42) Tile local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local10][local17];

client/src/main/java/Static107.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static107 {
 
 	@OriginalMember(owner = "client!id", name = "i", descriptor = "[[[I")
-	public static int[][][] anIntArrayArrayArray10;
+	public static int[][][] surfaceTileHeightMap;
 
 	@OriginalMember(owner = "client!id", name = "k", descriptor = "I")
 	public static int anInt2878;

client/src/main/java/Static110.java

@@ -25,7 +25,7 @@ public final class Static110 {
 		if (local6 != null) {
 			return local6;
 		}
-		@Pc(30) byte[] local30 = Static39.aClass153_23.method4495(11, arg0);
+		@Pc(30) byte[] local30 = Static39.aClass153_23.getFile(11, arg0);
 		local6 = new Class3_Sub2_Sub12();
 		if (local30 != null) {
 			local6.method2076(new Buffer(local30));
@@ -35,7 +35,7 @@ public final class Static110 {
 	}
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V")
-	public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub14[] arg1) {
+	public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) {
 		Static182.aClass3_Sub14ArrayArray2[arg0] = arg1;
 	}
 

client/src/main/java/Static111.java

@@ -63,7 +63,7 @@ public final class Static111 {
 	}
 
 	@OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V")
-	public static void method2292() {
+	public static void handleMouse() {
 		@Pc(2) Mouse local2 = Static93.aClass150_1;
 		synchronized (Static93.aClass150_1) {
 			Static22.anInt723 = Static57.anInt1759;

client/src/main/java/Static114.java

@@ -43,7 +43,7 @@ public final class Static114 {
 	}
 
 	@OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V")
-	public static void method4636(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
+	public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
 		@Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250);
 		@Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.method2860(arg1, 250) * 13;
 		if (GlRenderer.enabled) {

client/src/main/java/Static115.java

@@ -8,7 +8,7 @@ public final class Static115 {
 	public static int anInt2940;
 
 	@OriginalMember(owner = "client!ja", name = "f", descriptor = "Lclient!ih;")
-	public static final LinkedList aClass69_70 = new LinkedList();
+	public static final LinkedList mediumPriorityRequests = new LinkedList();
 
 	@OriginalMember(owner = "client!ja", name = "j", descriptor = "I")
 	public static int anInt2937 = 0;

client/src/main/java/Static117.java

@@ -81,7 +81,7 @@ public final class Static117 {
 	@OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;)Z")
 	private static boolean method2344(@OriginalArg(0) Js5 arg0) {
 		if (!aBoolean149) {
-			@Pc(7) byte[] local7 = arg0.method4495(0, 0);
+			@Pc(7) byte[] local7 = arg0.getFile(0, 0);
 			if (local7 == null) {
 				return false;
 			}
@@ -94,7 +94,7 @@ public final class Static117 {
 	@OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;II)Lclient!jc;")
 	public static VorbisSound method2345(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (method2344(arg0)) {
-			@Pc(16) byte[] local16 = arg0.method4495(arg1, arg2);
+			@Pc(16) byte[] local16 = arg0.getFile(arg1, arg2);
 			return local16 == null ? null : new VorbisSound(local16);
 		} else {
 			arg0.method4491(arg2, arg1);

client/src/main/java/Static12.java

@@ -7,7 +7,7 @@ public final class Static12 {
 	public static int anInt406;
 
 	@OriginalMember(owner = "client!bb", name = "g", descriptor = "[[[B")
-	public static final byte[][][] aByteArrayArrayArray2 = new byte[4][104][104];
+	public static final byte[][][] tileSettings = new byte[4][104][104];
 
 	@OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;")
 	public static final JagString aClass100_73 = Static28.parse("runes");

client/src/main/java/Static122.java

@@ -88,6 +88,6 @@ public final class Static122 {
 
 	@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
 	public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) {
-		return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.method4495(arg0, 0)) : null;
+		return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null;
 	}
 }

client/src/main/java/Static123.java

@@ -25,7 +25,7 @@ public final class Static123 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(26) byte[] local26 = Static23.aClass153_11.method4495(26, arg0);
+		@Pc(26) byte[] local26 = Static23.aClass153_11.getFile(26, arg0);
 		local10 = new StructType();
 		if (local26 != null) {
 			local10.method2806(new Buffer(local26));
@@ -35,7 +35,7 @@ public final class Static123 {
 	}
 
 	@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
-	public static void method2418() {
+	public static void topBannerRefresh() {
 		if (!Static249.aBoolean282 && Static83.modeWhere != 2) {
 			try {
 				Static206.aClass100_900.method3157(Static215.aClient1);
@@ -62,15 +62,15 @@ public final class Static123 {
 			@Pc(158) int local158;
 			@Pc(137) boolean local137;
 			if (local10.anInt4453 == 1) {
-				local14 = local10.anInt4452 + Static277.anInt5855 - Static167.anInt4069;
+				local14 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069;
-				if (local14 >= 0 && local14 <= Static277.anInt5855 + Static277.anInt5855) {
+				if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-					local115 = local10.anInt4461 + Static277.anInt5855 - Static193.anInt4539;
+					local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
 					if (local115 < 0) {
 						local115 = 0;
 					}
-					local126 = local10.anInt4464 + Static277.anInt5855 - Static193.anInt4539;
+					local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539;
-					if (local126 > Static277.anInt5855 + Static277.anInt5855) {
+					if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-						local126 = Static277.anInt5855 + Static277.anInt5855;
+						local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
 					}
 					local137 = false;
 					while (local115 <= local126) {
@@ -98,15 +98,15 @@ public final class Static123 {
 					}
 				}
 			} else if (local10.anInt4453 == 2) {
-				local14 = local10.anInt4461 + Static277.anInt5855 - Static193.anInt4539;
+				local14 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
-				if (local14 >= 0 && local14 <= Static277.anInt5855 + Static277.anInt5855) {
+				if (local14 >= 0 && local14 <= Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-					local115 = local10.anInt4452 + Static277.anInt5855 - Static167.anInt4069;
+					local115 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069;
 					if (local115 < 0) {
 						local115 = 0;
 					}
-					local126 = local10.anInt4446 + Static277.anInt5855 - Static167.anInt4069;
+					local126 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069;
-					if (local126 > Static277.anInt5855 + Static277.anInt5855) {
+					if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-						local126 = Static277.anInt5855 + Static277.anInt5855;
+						local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
 					}
 					local137 = false;
 					while (local115 <= local126) {
@@ -136,22 +136,22 @@ public final class Static123 {
 			} else if (local10.anInt4453 == 4) {
 				local14 = local10.anInt4444 - Static162.anInt3947;
 				if (local14 > 128) {
-					local115 = local10.anInt4461 + Static277.anInt5855 - Static193.anInt4539;
+					local115 = local10.anInt4461 + Static277.tileVisibilityDistance - Static193.anInt4539;
 					if (local115 < 0) {
 						local115 = 0;
 					}
-					local126 = local10.anInt4464 + Static277.anInt5855 - Static193.anInt4539;
+					local126 = local10.anInt4464 + Static277.tileVisibilityDistance - Static193.anInt4539;
-					if (local126 > Static277.anInt5855 + Static277.anInt5855) {
+					if (local126 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-						local126 = Static277.anInt5855 + Static277.anInt5855;
+						local126 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
 					}
 					if (local115 <= local126) {
-						@Pc(408) int local408 = local10.anInt4452 + Static277.anInt5855 - Static167.anInt4069;
+						@Pc(408) int local408 = local10.anInt4452 + Static277.tileVisibilityDistance - Static167.anInt4069;
 						if (local408 < 0) {
 							local408 = 0;
 						}
-						local158 = local10.anInt4446 + Static277.anInt5855 - Static167.anInt4069;
+						local158 = local10.anInt4446 + Static277.tileVisibilityDistance - Static167.anInt4069;
-						if (local158 > Static277.anInt5855 + Static277.anInt5855) {
+						if (local158 > Static277.tileVisibilityDistance + Static277.tileVisibilityDistance) {
-							local158 = Static277.anInt5855 + Static277.anInt5855;
+							local158 = Static277.tileVisibilityDistance + Static277.tileVisibilityDistance;
 						}
 						@Pc(430) boolean local430 = false;
 						label166: for (@Pc(432) int local432 = local408; local432 <= local158; local432++) {

client/src/main/java/Static124.java

@@ -72,7 +72,7 @@ public final class Static124 {
 					@Pc(90) CollisionMap local90 = null;
 					if (!arg1) {
 						@Pc(95) int local95 = local50;
-						if ((Static12.aByteArrayArrayArray2[1][local72][local76] & 0x2) == 2) {
+						if ((Static12.tileSettings[1][local72][local76] & 0x2) == 2) {
 							local95 = local50 - 1;
 						}
 						if (local95 >= 0) {

client/src/main/java/Static125.java

@@ -39,7 +39,7 @@ public final class Static125 {
 		Static6.outboundBuffer.p2(arg1);
 		Static226.anInt5079 = 0;
 		Static57.anInt1758 = 0;
-		Static179.anInt4261 = 1;
+		Static179.accountCreationStep = 1;
 		Static223.anInt5034 = -3;
 	}
 
@@ -49,7 +49,7 @@ public final class Static125 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(31) byte[] local31 = Static172.aClass153_69.method4495(Static254.method4349(arg0), Static274.method3845(arg0));
+		@Pc(31) byte[] local31 = Static172.aClass153_69.getFile(Static254.method4349(arg0), Static274.method3845(arg0));
 		local10 = new Class85();
 		if (local31 != null) {
 			local10.method2651(new Buffer(local31));
@@ -59,19 +59,19 @@ public final class Static125 {
 	}
 
 	@OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V")
-	public static void method2450() {
+	public static void updateLockedCamera() {
 		@Pc(9) int local9 = Static248.anInt4232 * 128 + 64;
 		@Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
 		@Pc(23) int local23 = Static207.method3685(Static55.level, local15, local9) - Static231.anInt5203;
 		if (Static113.anInt4612 >= 100) {
-			Static138.anInt3439 = Static245.anInt5375 * 128 + 64;
+			Static138.renderX = Static245.anInt5375 * 128 + 64;
-			Static134.anInt3302 = Static248.anInt4232 * 128 + 64;
+			Static134.renderZ = Static248.anInt4232 * 128 + 64;
-			Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203;
+			Static5.anInt40 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
 		} else {
-			if (Static138.anInt3439 < local15) {
+			if (Static138.renderX < local15) {
-				Static138.anInt3439 += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.anInt3439) / 1000;
+				Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000;
-				if (Static138.anInt3439 > local15) {
+				if (Static138.renderX > local15) {
-					Static138.anInt3439 = local15;
+					Static138.renderX = local15;
 				}
 			}
 			if (Static5.anInt40 < local23) {
@@ -80,16 +80,16 @@ public final class Static125 {
 					Static5.anInt40 = local23;
 				}
 			}
-			if (Static138.anInt3439 > local15) {
+			if (Static138.renderX > local15) {
-				Static138.anInt3439 -= Static233.anInt5225 + (Static138.anInt3439 - local15) * Static113.anInt4612 / 1000;
+				Static138.renderX -= Static233.anInt5225 + (Static138.renderX - local15) * Static113.anInt4612 / 1000;
-				if (Static138.anInt3439 < local15) {
+				if (Static138.renderX < local15) {
-					Static138.anInt3439 = local15;
+					Static138.renderX = local15;
 				}
 			}
-			if (Static134.anInt3302 < local9) {
+			if (Static134.renderZ < local9) {
-				Static134.anInt3302 += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.anInt3302) / 1000;
+				Static134.renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.renderZ) / 1000;
-				if (local9 < Static134.anInt3302) {
+				if (local9 < Static134.renderZ) {
-					Static134.anInt3302 = local9;
+					Static134.renderZ = local9;
 				}
 			}
 			if (local23 < Static5.anInt40) {
@@ -98,10 +98,10 @@ public final class Static125 {
 					Static5.anInt40 = local23;
 				}
 			}
-			if (Static134.anInt3302 > local9) {
+			if (Static134.renderZ > local9) {
-				Static134.anInt3302 -= Static233.anInt5225 + (Static134.anInt3302 - local9) * Static113.anInt4612 / 1000;
+				Static134.renderZ -= Static233.anInt5225 + (Static134.renderZ - local9) * Static113.anInt4612 / 1000;
-				if (local9 > Static134.anInt3302) {
+				if (local9 > Static134.renderZ) {
-					Static134.anInt3302 = local9;
+					Static134.renderZ = local9;
 				}
 			}
 		}
@@ -109,8 +109,8 @@ public final class Static125 {
 		local15 = Static251.anInt5449 * 128 + 64;
 		local23 = Static207.method3685(Static55.level, local15, local9) - Static57.anInt1744;
 		@Pc(236) int local236 = local23 - Static5.anInt40;
-		@Pc(241) int local241 = local9 - Static134.anInt3302;
+		@Pc(241) int local241 = local9 - Static134.renderZ;
-		@Pc(246) int local246 = local15 - Static138.anInt3439;
+		@Pc(246) int local246 = local15 - Static138.renderX;
 		@Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241));
 		@Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF;
 		if (local268 < 128) {
@@ -120,19 +120,19 @@ public final class Static125 {
 			local268 = 383;
 		}
 		@Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
-		if (Static240.anInt5333 < local268) {
+		if (Static240.cameraPitch < local268) {
-			Static240.anInt5333 += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.anInt5333) / 1000;
+			Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000;
-			if (Static240.anInt5333 > local268) {
+			if (Static240.cameraPitch > local268) {
-				Static240.anInt5333 = local268;
+				Static240.cameraPitch = local268;
 			}
 		}
-		if (Static240.anInt5333 > local268) {
+		if (Static240.cameraPitch > local268) {
-			Static240.anInt5333 -= (Static240.anInt5333 - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
+			Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
-			if (Static240.anInt5333 < local268) {
+			if (Static240.cameraPitch < local268) {
-				Static240.anInt5333 = local268;
+				Static240.cameraPitch = local268;
 			}
 		}
-		@Pc(350) int local350 = local292 - Static184.anInt4358;
+		@Pc(350) int local350 = local292 - Static184.cameraYaw;
 		if (local350 > 1024) {
 			local350 -= 2048;
 		}
@@ -140,14 +140,14 @@ public final class Static125 {
 			local350 += 2048;
 		}
 		if (local350 > 0) {
-			Static184.anInt4358 += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
+			Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
-			Static184.anInt4358 &= 0x7FF;
+			Static184.cameraYaw &= 0x7FF;
 		}
 		if (local350 < 0) {
-			Static184.anInt4358 -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
+			Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
-			Static184.anInt4358 &= 0x7FF;
+			Static184.cameraYaw &= 0x7FF;
 		}
-		@Pc(404) int local404 = local292 - Static184.anInt4358;
+		@Pc(404) int local404 = local292 - Static184.cameraYaw;
 		if (local404 > 1024) {
 			local404 -= 2048;
 		}
@@ -155,7 +155,7 @@ public final class Static125 {
 			local404 += 2048;
 		}
 		if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) {
-			Static184.anInt4358 = local292;
+			Static184.cameraYaw = local292;
 		}
 	}
 }

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.topLevelInterace != -1) {
+		if (Static154.topLevelInterface != -1) {
-			Static96.method1949(Static154.topLevelInterace);
+			Static96.method1949(Static154.topLevelInterface);
 		}
 		for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) {
 			if (Static186.aBooleanArray100[local15]) {
@@ -29,12 +29,12 @@ public final class Static126 {
 		}
 		Static97.anInt2503 = -1;
 		Static169.aClass13_18 = null;
-		Static182.anInt4311 = Static83.anInt372;
+		Static182.anInt4311 = Static83.loop;
 		if (GlRenderer.enabled) {
 			Static263.aBoolean299 = true;
 		}
 		Static214.anInt5574 = -1;
-		if (Static154.topLevelInterace != -1) {
+		if (Static154.topLevelInterface != -1) {
 			Static24.anInt766 = 0;
 			Static9.method182();
 		}

client/src/main/java/Static127.java

@@ -25,26 +25,26 @@ public final class Static127 {
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
 	public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
-		return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.method4495(arg0, 0)) : null;
+		return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null;
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
 	public static void method2463(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4, @OriginalArg(5) int arg5) {
-		if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || Static138.method2697())) {
+		if (Static80.anInt4701 == arg2 && arg1 == Static52.anInt1695 && (Static41.anInt1316 == arg0 || Static138.allLevelsAreVisible())) {
 			return;
 		}
 		Static80.anInt4701 = arg2;
 		Static52.anInt1695 = arg1;
 		Static41.anInt1316 = arg0;
-		if (Static138.method2697()) {
+		if (Static138.allLevelsAreVisible()) {
 			Static41.anInt1316 = 0;
 		}
 		if (arg4) {
-			Static196.method3534(28);
+			Static196.setGameState(28);
 		} else {
-			Static196.method3534(25);
+			Static196.setGameState(25);
 		}
-		Static114.method4636(true, LocalizedText.LOADING);
+		Static114.drawTextOnScreen(true, LocalizedText.LOADING);
 		@Pc(53) int local53 = Static142.originZ;
 		@Pc(55) int local55 = Static225.originX;
 		Static142.originZ = arg1 * 8 - 48;
@@ -52,7 +52,7 @@ public final class Static127 {
 		Static158.aClass3_Sub2_Sub4_3 = Static29.method803(Static80.anInt4701 * 8, Static52.anInt1695 * 8);
 		@Pc(81) int local81 = Static142.originZ - local53;
 		@Pc(86) int local86 = Static225.originX - local55;
-		Static235.aClass134_2 = null;
+		Static235.mapFunctionGroup = null;
 		@Pc(96) int local96;
 		@Pc(103) Npc local103;
 		@Pc(109) int local109;
@@ -138,14 +138,14 @@ public final class Static127 {
 			}
 		}
 		if (arg4) {
-			Static138.anInt3439 -= local86 * 128;
+			Static138.renderX -= local86 * 128;
-			Static134.anInt3302 -= local81 * 128;
+			Static134.renderZ -= local81 * 128;
 			Static248.anInt4232 -= local81;
 			Static251.anInt5449 -= local86;
 			Static265.anInt5765 -= local81;
 			Static245.anInt5375 -= local86;
 		} else {
-			Static227.anInt5096 = 1;
+			Static227.cameraType = 1;
 		}
 		Static189.anInt4451 = 0;
 		if (Static115.anInt2939 != 0) {
@@ -295,7 +295,7 @@ public final class Static127 {
 				GameShell.replaceCanvas = true;
 			}
 			if (arg0.method3111(Static148.aClass100_677)) {
-				Static196.method3534(25);
+				Static196.setGameState(25);
 			}
 			if (arg0.method3111(Static107.aClass100_566)) {
 				Static43.displayFps = true;

client/src/main/java/Static132.java

@@ -51,8 +51,8 @@ public final class Static132 {
 			Static13.anInt436 = Static231.anInt5204 * 15 + (Static261.aBoolean298 ? 26 : 22);
 			Static24.anInt761 = local43 + 8;
 		}
-		if (Static154.topLevelInterace != -1) {
+		if (Static154.topLevelInterface != -1) {
-			Static54.method1304(1, Static154.topLevelInterace);
+			Static54.method1304(1, Static154.topLevelInterface);
 		}
 	}
 
@@ -97,10 +97,10 @@ public final class Static132 {
 		@Pc(21) int local21 = local20 = local7 + 128;
 		@Pc(26) int local26;
 		@Pc(27) int local27 = local26 = local15 + 128;
-		@Pc(37) int local37 = Static83.anIntArrayArrayArray4[arg1][arg6][arg7] - Static162.anInt3947;
+		@Pc(37) int local37 = Static83.activeTileHeightMap[arg1][arg6][arg7] - Static162.anInt3947;
-		@Pc(49) int local49 = Static83.anIntArrayArrayArray4[arg1][arg6 + 1][arg7] - Static162.anInt3947;
+		@Pc(49) int local49 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7] - Static162.anInt3947;
-		@Pc(63) int local63 = Static83.anIntArrayArrayArray4[arg1][arg6 + 1][arg7 + 1] - Static162.anInt3947;
+		@Pc(63) int local63 = Static83.activeTileHeightMap[arg1][arg6 + 1][arg7 + 1] - Static162.anInt3947;
-		@Pc(75) int local75 = Static83.anIntArrayArrayArray4[arg1][arg6][arg7 + 1] - Static162.anInt3947;
+		@Pc(75) int local75 = Static83.activeTileHeightMap[arg1][arg6][arg7 + 1] - Static162.anInt3947;
 		@Pc(85) int local85 = local15 * arg4 + local7 * arg5 >> 16;
 		@Pc(95) int local95 = local15 * arg5 - local7 * arg4 >> 16;
 		@Pc(97) int local97 = local85;

client/src/main/java/Static134.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static134 {
 
 	@OriginalMember(owner = "client!kh", name = "f", descriptor = "I")
-	public static int anInt3302;
+	public static int renderZ;
 
 	@OriginalMember(owner = "client!kh", name = "g", descriptor = "Lclient!hh;")
 	public static final Class59 aClass59_2 = new Class59();

client/src/main/java/Static136.java

@@ -99,7 +99,7 @@ public final class Static136 {
 		} else {
 			Static178.highDetailLighting = arg0.g1() == 1;
 		}
-		Static220.aBoolean244 = arg0.g1() == 1;
+		Static220.highWaterDetail = arg0.g1() == 1;
 		Static71.aBoolean107 = arg0.g1() == 1;
 		Static102.windowMode = arg0.g1();
 		if (Static102.windowMode > 2) {

client/src/main/java/Static137.java

@@ -38,10 +38,10 @@ public final class Static137 {
 			for (local37 = 1; local37 < 103; local37++) {
 				local76 = 4 * 512 * (103 - local37) + 24628;
 				for (local80 = 1; local80 < 103; local80++) {
-					if ((Static12.aByteArrayArrayArray2[arg0][local80][local37] & 0x18) == 0) {
+					if ((Static12.tileSettings[arg0][local80][local37] & 0x18) == 0) {
 						Static152.method2835(local32, local76, arg0, local80, local37);
 					}
-					if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local80][local37] & 0x8) != 0) {
+					if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local80][local37] & 0x8) != 0) {
 						Static152.method2835(local32, local76, arg0 + 1, local80, local37);
 					}
 					local76 += 4;
@@ -101,7 +101,7 @@ public final class Static137 {
 		local35 = (int) (Math.random() * 20.0D) + 238 - 10 << 16;
 		for (local37 = 1; local37 < 103; local37++) {
 			for (local76 = 1; local76 < 103; local76++) {
-				if ((Static12.aByteArrayArrayArray2[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) {
+				if ((Static12.tileSettings[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) {
 					if (GlRenderer.enabled) {
 						Static129.pixels = null;
 					} else {
@@ -109,7 +109,7 @@ public final class Static137 {
 					}
 					return false;
 				}
-				if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) {
+				if (arg0 < 3 && (Static12.tileSettings[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) {
 					if (GlRenderer.enabled) {
 						Static129.pixels = null;
 					} else {

client/src/main/java/Static138.java

@@ -17,7 +17,7 @@ public final class Static138 {
 	public static Js5 js5Archive15;
 
 	@OriginalMember(owner = "client!km", name = "Pc", descriptor = "I")
-	public static int anInt3439;
+	public static int renderX;
 
 	@OriginalMember(owner = "client!km", name = "Yc", descriptor = "I")
 	public static int anInt3443;
@@ -77,7 +77,7 @@ public final class Static138 {
 	public static final JagString aClass100_654 = Static28.parse(":trade:");
 
 	@OriginalMember(owner = "client!km", name = "ad", descriptor = "I")
-	public static int anInt3445 = 0;
+	public static int fp = 0;
 
 	@OriginalMember(owner = "client!km", name = "b", descriptor = "(III)I")
 	public static int method2695(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@@ -103,7 +103,7 @@ public final class Static138 {
 	}
 
 	@OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
-	public static boolean method2697() {
+	public static boolean allLevelsAreVisible() {
 		return GlRenderer.enabled ? true : Static162.aBoolean190;
 	}
 

client/src/main/java/Static140.java

@@ -87,7 +87,7 @@ public final class Static140 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(26) byte[] local26 = Static85.aClass153_36.method4495(31, arg0);
+		@Pc(26) byte[] local26 = Static85.aClass153_36.getFile(31, arg0);
 		local10 = new LightType();
 		if (local26 != null) {
 			local10.method2257(new Buffer(local26), arg0);
@@ -97,7 +97,7 @@ public final class Static140 {
 	}
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;")
-	public static Class134 method2711(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) {
+	public static Class134 createMapFunctionGroup(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) {
 		@Pc(10) int local10 = arg1.getGroupId(arg0);
 		if (local10 == -1) {
 			return new Class134(0);
@@ -105,7 +105,7 @@ public final class Static140 {
 		@Pc(29) int[] local29 = arg1.method4503(local10);
 		@Pc(35) Class134 local35 = new Class134(local29.length);
 		for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) {
-			@Pc(56) Buffer local56 = new Buffer(arg1.method4495(local10, local29[local37]));
+			@Pc(56) Buffer local56 = new Buffer(arg1.getFile(local10, local29[local37]));
 			local35.aClass100Array153[local37] = local56.gjstr();
 			local35.aByteArray69[local37] = local56.g1s();
 			local35.aShortArray73[local37] = (short) local56.g2();

client/src/main/java/Static141.java

@@ -63,14 +63,14 @@ public final class Static141 {
 		Static92.aClass3_Sub2_Sub1_6 = null;
 		Static165.aClass3_Sub2_Sub1_8 = null;
 		Static181.aClass3_Sub2_Sub1_9 = null;
-		if (Static244.anInt5370 == 5) {
+		if (Static244.gameState == 5) {
 			Static181.method3344(Static209.js5Archive8);
 		}
-		if (Static244.anInt5370 == 10) {
+		if (Static244.gameState == 10) {
 			Static73.method1596(false);
 		}
-		if (Static244.anInt5370 == 30) {
+		if (Static244.gameState == 30) {
-			Static196.method3534(25);
+			Static196.setGameState(25);
 		}
 	}
 
@@ -82,11 +82,11 @@ public final class Static141 {
 		Static233.anInt5225 = arg1;
 		Static248.anInt4232 = arg4;
 		if (arg0 && Static113.anInt4612 >= 100) {
-			Static138.anInt3439 = Static245.anInt5375 * 128 + 64;
+			Static138.renderX = Static245.anInt5375 * 128 + 64;
-			Static134.anInt3302 = Static248.anInt4232 * 128 + 64;
+			Static134.renderZ = Static248.anInt4232 * 128 + 64;
-			Static5.anInt40 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302) - Static231.anInt5203;
+			Static5.anInt40 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
 		}
-		Static227.anInt5096 = 2;
+		Static227.cameraType = 2;
 	}
 
 	@OriginalMember(owner = "client!lb", name = "a", descriptor = "(Lclient!ve;Lclient!ve;ILclient!ve;)V")

client/src/main/java/Static142.java

@@ -66,7 +66,7 @@ public final class Static142 {
 					@Pc(308) Class102[] local308 = Static143.aClass102Array1;
 					for (local310 = 0; local310 < local308.length; local310++) {
 						@Pc(322) Class102 local322 = local308[local310];
-						if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - Static267.anInt5774] && Static83.anInt372 % 20 < 10) {
+						if (local322 != null && local322.anInt4058 == 1 && local322.anInt4057 == Static33.anIntArray79[local5 - Static267.anInt5774] && Static83.loop % 20 < 10) {
 							if (local58.anInt3730 == -1) {
 								local359 = local17.method2691() + 15;
 							} else {
@@ -121,7 +121,7 @@ public final class Static142 {
 						Static277.anInt5854++;
 					}
 				}
-				if (local17.anInt3378 > Static83.anInt372) {
+				if (local17.anInt3378 > Static83.loop) {
 					@Pc(508) Sprite local508 = Static116.aClass3_Sub2_Sub1Array3[0];
 					@Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1];
 					if (local17 instanceof Npc) {
@@ -167,7 +167,7 @@ public final class Static142 {
 					}
 				}
 				for (local74 = 0; local74 < 4; local74++) {
-					if (local17.anIntArray319[local74] > Static83.anInt372) {
+					if (local17.anIntArray319[local74] > Static83.loop) {
 						if (local17 instanceof Npc) {
 							@Pc(725) Npc local725 = (Npc) local17;
 							@Pc(728) NpcType local728 = local725.aClass96_1;

client/src/main/java/Static145.java

@@ -21,11 +21,11 @@ public final class Static145 {
 
 	@OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V")
 	public static void method2742() {
-		if (Static244.anInt5370 == 10 && GlRenderer.enabled) {
+		if (Static244.gameState == 10 && GlRenderer.enabled) {
-			Static196.method3534(28);
+			Static196.setGameState(28);
 		}
-		if (Static244.anInt5370 == 30) {
+		if (Static244.gameState == 30) {
-			Static196.method3534(25);
+			Static196.setGameState(25);
 		}
 	}
 
@@ -102,6 +102,6 @@ public final class Static145 {
 
 	@OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I")
 	public static int method2746() {
-		return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.aBoolean244 ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23));
+		return ((Static99.stereo ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.highWaterDetail ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.highDetailTextures ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.brightness & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23));
 	}
 }

client/src/main/java/Static146.java

@@ -36,8 +36,8 @@ public final class Static146 {
 	@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
 	public static void method2750(@OriginalArg(0) int arg0) {
 		Static235.anInt5276 = arg0;
-		for (@Pc(3) int local3 = 0; local3 < Static152.anInt3594; local3++) {
+		for (@Pc(3) int local3 = 0; local3 < Static152.mapSizeX; local3++) {
-			for (@Pc(8) int local8 = 0; local8 < Static99.anInt2550; local8++) {
+			for (@Pc(8) int local8 = 0; local8 < Static99.mapSizeZ; local8++) {
 				if (Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] == null) {
 					Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] = new Tile(arg0, local3, local8);
 				}

client/src/main/java/Static148.java

@@ -37,7 +37,7 @@ public final class Static148 {
 
 	@OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
 	public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		Static7.anIntArray75[arg0] = arg1;
+		Static7.varps[arg0] = arg1;
 		@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.method3863((long) arg0);
 		if (local21 == null) {
 			local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
@@ -53,7 +53,7 @@ public final class Static148 {
 		if (local16 != null) {
 			return local16;
 		}
-		@Pc(26) byte[] local26 = Static261.js5Archive13.method4495(arg0, 0);
+		@Pc(26) byte[] local26 = Static261.js5Archive13.getFile(arg0, 0);
 		local16 = new SoftwareFont(local26);
 		local16.method2873(Static159.aClass36Array12, null);
 		Static139.aClass99_22.method3095(local16, (long) arg0);

client/src/main/java/Static150.java

@@ -87,9 +87,9 @@ 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.arguments = arg2.anObjectArray17;
 			local305.source = arg2;
-			Static185.aClass69_101.method2282(local305);
+			Static185.lowPriorityRequests.method2282(local305);
 		}
 	}
 

client/src/main/java/Static152.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static152 {
 
 	@OriginalMember(owner = "client!ma", name = "i", descriptor = "I")
-	public static int anInt3594;
+	public static int mapSizeX;
 
 	@OriginalMember(owner = "client!ma", name = "q", descriptor = "Lclient!fd;")
 	public static WorldMapFont aClass41_3;

client/src/main/java/Static154.java

@@ -17,7 +17,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 topLevelInterace = -1;
+	public static int topLevelInterface = -1;
 
 	@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
 	public static boolean method2926(@OriginalArg(0) Component arg0) {

client/src/main/java/Static155.java

@@ -64,12 +64,12 @@ public final class Static155 {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
-	public static int method2945(@OriginalArg(1) int arg0) {
+	public static int getVarbit(@OriginalArg(1) int arg0) {
 		@Pc(13) Class85 local13 = Static125.method2449(arg0);
 		@Pc(16) int local16 = local13.anInt3327;
 		@Pc(19) int local19 = local13.anInt3323;
 		@Pc(22) int local22 = local13.anInt3318;
 		@Pc(29) int local29 = Class3_Sub9.anIntArray135[local19 - local22];
-		return Static7.anIntArray75[local16] >> local22 & local29;
+		return Static7.varps[local16] >> local22 & local29;
 	}
 }

client/src/main/java/Static156.java

@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static156 {
 
 	@OriginalMember(owner = "client!mf", name = "O", descriptor = "[[B")
-	public static byte[][] aByteArrayArray11;
+	public static byte[][] locationMapFilesBuffer;
 
 	@OriginalMember(owner = "client!mf", name = "W", descriptor = "Lclient!ve;")
 	public static Js5 js5Archive22;
@@ -21,13 +21,13 @@ public final class Static156 {
 	public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) {
 		if (arg0 < 0) {
 			arg0 = 0;
-		} else if (arg0 >= Static152.anInt3594 * 128) {
+		} else if (arg0 >= Static152.mapSizeX * 128) {
-			arg0 = Static152.anInt3594 * 128 - 1;
+			arg0 = Static152.mapSizeX * 128 - 1;
 		}
 		if (arg2 < 0) {
 			arg2 = 0;
-		} else if (arg2 >= Static99.anInt2550 * 128) {
+		} else if (arg2 >= Static99.mapSizeZ * 128) {
-			arg2 = Static99.anInt2550 * 128 - 1;
+			arg2 = Static99.mapSizeZ * 128 - 1;
 		}
 		Static109.anInt2886 = MathUtils.anIntArray223[arg3];
 		Static121.anInt3038 = MathUtils.anIntArray225[arg3];
@@ -38,21 +38,21 @@ public final class Static156 {
 		Static217.anInt4903 = arg2;
 		Static167.anInt4069 = arg0 / 128;
 		Static193.anInt4539 = arg2 / 128;
-		Static31.anInt987 = Static167.anInt4069 - Static277.anInt5855;
+		Static31.anInt987 = Static167.anInt4069 - Static277.tileVisibilityDistance;
 		if (Static31.anInt987 < 0) {
 			Static31.anInt987 = 0;
 		}
-		Static80.anInt4698 = Static193.anInt4539 - Static277.anInt5855;
+		Static80.anInt4698 = Static193.anInt4539 - Static277.tileVisibilityDistance;
 		if (Static80.anInt4698 < 0) {
 			Static80.anInt4698 = 0;
 		}
-		Static2.anInt15 = Static167.anInt4069 + Static277.anInt5855;
+		Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance;
-		if (Static2.anInt15 > Static152.anInt3594) {
+		if (Static2.anInt15 > Static152.mapSizeX) {
-			Static2.anInt15 = Static152.anInt3594;
+			Static2.anInt15 = Static152.mapSizeX;
 		}
-		Static215.anInt4866 = Static193.anInt4539 + Static277.anInt5855;
+		Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance;
-		if (Static215.anInt4866 > Static99.anInt2550) {
+		if (Static215.anInt4866 > Static99.mapSizeZ) {
-			Static215.anInt4866 = Static99.anInt2550;
+			Static215.anInt4866 = Static99.mapSizeZ;
 		}
 		@Pc(99) short local99;
 		if (GlRenderer.enabled) {
@@ -62,28 +62,28 @@ public final class Static156 {
 		}
 		@Pc(104) int local104;
 		@Pc(113) int local113;
-		for (local104 = 0; local104 < Static277.anInt5855 + Static277.anInt5855 + 2; local104++) {
+		for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local104++) {
-			for (local113 = 0; local113 < Static277.anInt5855 + Static277.anInt5855 + 2; local113++) {
+			for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2; local113++) {
-				@Pc(130) int local130 = (local104 - Static277.anInt5855 << 7) - (Static149.anInt3555 & 0x7F);
+				@Pc(130) int local130 = (local104 - Static277.tileVisibilityDistance << 7) - (Static149.anInt3555 & 0x7F);
-				@Pc(140) int local140 = (local113 - Static277.anInt5855 << 7) - (Static217.anInt4903 & 0x7F);
+				@Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
-				@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.anInt5855;
+				@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance;
-				@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.anInt5855;
+				@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance;
-				if (local146 >= 0 && local152 >= 0 && local146 < Static152.anInt3594 && local152 < Static99.anInt2550) {
+				if (local146 >= 0 && local152 >= 0 && local146 < Static152.mapSizeX && local152 < Static99.mapSizeZ) {
 					@Pc(176) int local176;
-					if (Static80.anIntArrayArrayArray19 == null) {
+					if (Static80.underWaterTileHeightMap == null) {
-						local176 = Static107.anIntArrayArrayArray10[0][local146][local152] + 128 - Static162.anInt3947;
+						local176 = Static107.surfaceTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947;
 					} else {
-						local176 = Static80.anIntArrayArrayArray19[0][local146][local152] + 128 - Static162.anInt3947;
+						local176 = Static80.underWaterTileHeightMap[0][local146][local152] + 128 - Static162.anInt3947;
 					}
-					@Pc(201) int local201 = Static107.anIntArrayArrayArray10[3][local146][local152] - Static162.anInt3947 - 1000;
+					@Pc(201) int local201 = Static107.surfaceTileHeightMap[3][local146][local152] - Static162.anInt3947 - 1000;
 					Static89.aBooleanArrayArray3[local104][local113] = Static160.method3049(local130, local201, local176, local140, local99);
 				} else {
 					Static89.aBooleanArrayArray3[local104][local113] = false;
 				}
 			}
 		}
-		for (local104 = 0; local104 < Static277.anInt5855 + Static277.anInt5855 + 1; local104++) {
+		for (local104 = 0; local104 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local104++) {
-			for (local113 = 0; local113 < Static277.anInt5855 + Static277.anInt5855 + 1; local113++) {
+			for (local113 = 0; local113 < Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1; local113++) {
 				Static48.aBooleanArrayArray1[local104][local113] = Static89.aBooleanArrayArray3[local104][local113] || Static89.aBooleanArrayArray3[local104 + 1][local113] || Static89.aBooleanArrayArray3[local104][local113 + 1] || Static89.aBooleanArrayArray3[local104 + 1][local113 + 1];
 			}
 		}
@@ -93,8 +93,8 @@ public final class Static156 {
 		Static234.anIntArray454 = arg9;
 		Static206.anIntArray427 = arg10;
 		Static123.method2419();
-		if (Static276.aClass3_Sub5ArrayArrayArray3 != null) {
+		if (Static276.underWaterGroundTiles != null) {
-			Static278.method4648(true);
+			Static278.setRenderTiles(true);
 			Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
 			if (GlRenderer.enabled) {
 				Static119.aBoolean153 = false;
@@ -102,7 +102,7 @@ public final class Static156 {
 				Static161.method3066(null);
 				Static120.method2390();
 			}
-			Static278.method4648(false);
+			Static278.setRenderTiles(false);
 		}
 		Static248.method3292(arg0, arg1, arg2, arg5, arg11, arg12, arg13, arg14);
 	}
@@ -160,8 +160,8 @@ public final class Static156 {
 		local1.glPushAttrib(GL2.GL_FOG_BIT);
 		local1.glFogf(GL2.GL_FOG_START, 3072.0F);
 		GlRenderer.disableDepthMask();
-		for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) {
+		for (@Pc(19) int local19 = 0; local19 < Static36.surfaceHdTiles[0].length; local19++) {
-			@Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19];
+			@Pc(31) GlTile local31 = Static36.surfaceHdTiles[0][local19];
 			if (local31.anInt2485 >= 0 && Rasteriser.textureProvider.method3237(local31.anInt2485) == 4) {
 				local1.glColor4fv(Static190.method3441(local31.anInt2486), 0);
 				@Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F);

client/src/main/java/Static158.java

@@ -21,8 +21,8 @@ public final class Static158 {
 	public static int anInt3857 = 0;
 
 	@OriginalMember(owner = "client!mh", name = "f", descriptor = "(B)V")
-	public static void method3008() {
+	public static void handleAccountCreation() {
-		if (Static179.anInt4261 == 0) {
+		if (Static179.accountCreationStep == 0) {
 			return;
 		}
 		try {
@@ -33,10 +33,10 @@ public final class Static158 {
 				}
 				if (Static57.anInt1758 >= 1) {
 					Static223.anInt5034 = -5;
-					Static179.anInt4261 = 0;
+					Static179.accountCreationStep = 0;
 					return;
 				}
-				Static179.anInt4261 = 1;
+				Static179.accountCreationStep = 1;
 				Static226.anInt5079 = 0;
 				Static57.anInt1758++;
 				if (Static209.port == Static271.defaultPort) {
@@ -45,12 +45,12 @@ public final class Static158 {
 					Static209.port = Static271.defaultPort;
 				}
 			}
-			if (Static179.anInt4261 == 1) {
+			if (Static179.accountCreationStep == 1) {
 				Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port);
-				Static179.anInt4261 = 2;
+				Static179.accountCreationStep = 2;
 			}
 			@Pc(120) int local120;
-			if (Static179.anInt4261 == 2) {
+			if (Static179.accountCreationStep == 2) {
 				if (Static72.aClass212_3.status == 2) {
 					throw new IOException();
 				}
@@ -75,21 +75,21 @@ public final class Static158 {
 				}
 				if (local120 != 21) {
 					Static223.anInt5034 = local120;
-					Static179.anInt4261 = 0;
+					Static179.accountCreationStep = 0;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
-				Static179.anInt4261 = 3;
+				Static179.accountCreationStep = 3;
 			}
-			if (Static179.anInt4261 == 3) {
+			if (Static179.accountCreationStep == 3) {
 				if (Static124.socket.available() < 1) {
 					return;
 				}
 				Static229.aClass100Array156 = new JagString[Static124.socket.read()];
-				Static179.anInt4261 = 4;
+				Static179.accountCreationStep = 4;
 			}
-			if (Static179.anInt4261 == 4) {
+			if (Static179.accountCreationStep == 4) {
 				if (Static124.socket.available() < Static229.aClass100Array156.length * 8) {
 					return;
 				}
@@ -99,7 +99,7 @@ public final class Static158 {
 					Static229.aClass100Array156[local120] = Static79.decode37(Static57.aClass3_Sub15_Sub1_3.g8());
 				}
 				Static223.anInt5034 = 21;
-				Static179.anInt4261 = 0;
+				Static179.accountCreationStep = 0;
 				Static124.socket.close();
 				Static124.socket = null;
 				return;
@@ -117,10 +117,10 @@ public final class Static158 {
 					Static209.port = Static271.defaultPort;
 				}
 				Static226.anInt5079 = 0;
-				Static179.anInt4261 = 1;
+				Static179.accountCreationStep = 1;
 			} else {
 				Static223.anInt5034 = -4;
-				Static179.anInt4261 = 0;
+				Static179.accountCreationStep = 0;
 			}
 		}
 	}
@@ -131,37 +131,37 @@ public final class Static158 {
 	}
 
 	@OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
-	public static void method3013() {
+	public static void decodeNpcFiles() {
-		@Pc(10) int local10 = Static191.aByteArrayArray15.length;
+		@Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length;
 		for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
-			if (Static191.aByteArrayArray15[local16] != null) {
+			if (Static191.npcSpawnsFilesBuffer[local16] != null) {
 				@Pc(25) int local25 = -1;
 				for (@Pc(27) int local27 = 0; local27 < Static157.anInt3811; local27++) {
-					if (Static217.anIntArray434[local27] == Static238.anIntArray470[local16]) {
+					if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) {
 						local25 = local27;
 						break;
 					}
 				}
 				if (local25 == -1) {
-					Static217.anIntArray434[Static157.anInt3811] = Static238.anIntArray470[local16];
+					Static217.anIntArray434[Static157.anInt3811] = Static238.regionBitPacked[local16];
 					local25 = Static157.anInt3811++;
 				}
 				@Pc(67) int local67 = 0;
-				@Pc(74) Buffer local74 = new Buffer(Static191.aByteArrayArray15[local16]);
+				@Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]);
-				while (local74.offset < Static191.aByteArrayArray15[local16].length && local67 < 511) {
+				while (local74.offset < Static191.npcSpawnsFilesBuffer[local16].length && local67 < 511) {
 					@Pc(97) int local97 = local67++ << 6 | local25;
 					@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.originX;
+					@Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Static225.originX;
 					@Pc(129) int local129 = local103 & 0x3F;
-					@Pc(142) int local142 = local129 + (Static238.anIntArray470[local16] & 0xFF) * 64 - Static142.originZ;
+					@Pc(142) int local142 = local129 + (Static238.regionBitPacked[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();
 						@Pc(198) Npc local198 = Static175.aClass8_Sub4_Sub2Array1[local97];
 						Static33.anIntArray79[Static272.anInt5214++] = local97;
-						local198.anInt3430 = Static83.anInt372;
+						local198.anInt3430 = Static83.loop;
 						local198.method2698(local148);
 						local198.method2692(local198.aClass96_1.anInt3713);
 						local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.aClass96_1.aByte11];

client/src/main/java/Static160.java

@@ -40,9 +40,9 @@ public final class Static160 {
 				Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
 			}
 		} else if (GlRenderer.enabled) {
-			((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, 256, (GlSprite) arg2.method489(false));
+			((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.yawTarget, 256, (GlSprite) arg2.method489(false));
 		} else {
-			((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, arg2.anIntArray37, arg2.anIntArray45);
+			((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
 		}
 		Static31.aBooleanArray29[arg3] = true;
 	}

client/src/main/java/Static172.java

@@ -17,7 +17,7 @@ public final class Static172 {
 	public static Js5 aClass153_70;
 
 	@OriginalMember(owner = "client!nj", name = "j", descriptor = "[I")
-	public static int[] anIntArray366;
+	public static int[] locationsMapFileIds;
 
 	@OriginalMember(owner = "client!nj", name = "k", descriptor = "I")
 	public static int anInt4165;

client/src/main/java/Static175.java

@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static175 {
 
 	@OriginalMember(owner = "client!nm", name = "P", descriptor = "[I")
-	public static int[] anIntArray371;
+	public static int[] npcSpawnsFileIds;
 
 	@OriginalMember(owner = "client!nm", name = "W", descriptor = "Lclient!na;")
 	public static JagString url;
@@ -12,7 +12,7 @@ public final class Static175 {
 	public static final Npc[] aClass8_Sub4_Sub2Array1 = new Npc[32768];
 
 	@OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
-	public static int anInt4220 = 0;
+	public static int mapFilesMissingCount = 0;
 
 	@OriginalMember(owner = "client!nm", name = "Y", descriptor = "J")
 	public static long firstGc = 0L;
@@ -23,11 +23,11 @@ public final class Static175 {
 	@OriginalMember(owner = "client!nm", name = "a", descriptor = "(Z)V")
 	public static void method3279() {
 		if (Static267.anInt5775 > 0) {
-			Static278.method4653();
+			Static278.processLogout();
 		} else {
 			Static233.aClass95_4 = Static124.socket;
 			Static124.socket = null;
-			Static196.method3534(40);
+			Static196.setGameState(40);
 		}
 	}
 }

client/src/main/java/Static179.java

@@ -16,7 +16,7 @@ public final class Static179 {
 	public static final SoftLruHashTable aClass99_25 = new SoftLruHashTable(64);
 
 	@OriginalMember(owner = "client!oe", name = "l", descriptor = "I")
-	public static int anInt4261 = 0;
+	public static int accountCreationStep = 0;
 
 	@OriginalMember(owner = "client!oe", name = "n", descriptor = "I")
 	public static int anInt4262 = 1;

client/src/main/java/Static18.java

@@ -20,14 +20,14 @@ public final class Static18 {
 	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");
+	public static final JagString COMPLETE_PERCENT = Static28.parse("<br>(X100(U(Y");
 
 	@OriginalMember(owner = "client!bh", name = "G", descriptor = "[I")
 	public static final int[] anIntArray57 = new int[] { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1 };
 
 	@OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V")
 	public static void method553(@OriginalArg(0) PathingEntity arg0) {
-		@Pc(8) int local8 = arg0.anInt3395 - Static83.anInt372;
+		@Pc(8) int local8 = arg0.anInt3395 - Static83.loop;
 		@Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.method2693() * 64;
 		@Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.method2693() * 64;
 		if (arg0.anInt3431 == 0) {
@@ -85,10 +85,10 @@ public final class Static18 {
 			local55 = local72 * local57 >> 16;
 			local57 = local57 * local68 >> 16;
 		}
-		Static240.anInt5333 = arg6;
+		Static240.cameraPitch = arg6;
-		Static184.anInt4358 = arg4;
+		Static184.cameraYaw = arg4;
-		Static134.anInt3302 = arg5 - local57;
+		Static134.renderZ = arg5 - local57;
-		Static138.anInt3439 = arg0 - local55;
+		Static138.renderX = arg0 - local55;
 		Static5.anInt40 = arg2 - local59;
 	}
 

client/src/main/java/Static180.java

@@ -11,7 +11,7 @@ public final class Static180 {
 	public static Component aClass13_22;
 
 	@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
-	public static JagString[] aClass100Array125;
+	public static JagString[] stringLocals;
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;Lclient!ve;B)V")
 	public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {

client/src/main/java/Static182.java

@@ -11,7 +11,7 @@ public final class Static182 {
 	public static Js5 aClass153_77;
 
 	@OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
-	public static Class3_Sub14[][] aClass3_Sub14ArrayArray2;
+	public static GlTile[][] aClass3_Sub14ArrayArray2;
 
 	@OriginalMember(owner = "client!oj", name = "p", descriptor = "I")
 	public static final int anInt4306 = 2301979;

client/src/main/java/Static184.java

@@ -8,10 +8,10 @@ public final class Static184 {
 	public static Js5 js5Archive10;
 
 	@OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
-	public static int anInt4358;
+	public static int cameraYaw;
 
 	@OriginalMember(owner = "client!ol", name = "V", descriptor = "I")
-	public static int anInt4348 = 0;
+	public static int loginStep = 0;
 
 	@OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;")
 	public static final JagString aClass100_819 = Static28.parse("<col=00ff80>");

client/src/main/java/Static185.java

@@ -11,7 +11,7 @@ public final class Static185 {
 	public static float aFloat23;
 
 	@OriginalMember(owner = "client!p", name = "c", descriptor = "Lclient!ih;")
-	public static final LinkedList aClass69_101 = new LinkedList();
+	public static final LinkedList lowPriorityRequests = new LinkedList();
 
 	@OriginalMember(owner = "client!p", name = "d", descriptor = "I")
 	public static int anInt4369 = 0;
@@ -21,15 +21,15 @@ public final class Static185 {
 
 	@OriginalMember(owner = "client!p", name = "a", descriptor = "(I)V")
 	public static void method3395() {
-		if (Static184.anInt4348 == 5) {
+		if (Static184.loginStep == 5) {
-			Static184.anInt4348 = 6;
+			Static184.loginStep = 6;
 		}
 	}
 
 	@OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V")
 	public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
-		if (arg1 && !Static138.method2697() && (Static12.aByteArrayArrayArray2[0][arg7][arg8] & 0x2) == 0) {
+		if (arg1 && !Static138.allLevelsAreVisible() && (Static12.tileSettings[0][arg7][arg8] & 0x2) == 0) {
-			if ((Static12.aByteArrayArrayArray2[arg2][arg7][arg8] & 0x10) != 0) {
+			if ((Static12.tileSettings[arg2][arg7][arg8] & 0x10) != 0) {
 				return;
 			}
 			if (Static4.method22(arg8, arg7, arg2) != Static41.anInt1316) {
@@ -70,22 +70,22 @@ public final class Static185 {
 			local129 = (local81 >> 1) + arg8;
 			local133 = arg8 + (local81 + 1 >> 1);
 		}
-		@Pc(153) int[][] local153 = Static83.anIntArrayArrayArray4[arg0];
+		@Pc(153) int[][] local153 = Static83.activeTileHeightMap[arg0];
 		@Pc(165) int local165 = (local84 << 6) + (arg7 << 7);
 		@Pc(173) int local173 = (local81 << 6) + (arg8 << 7);
 		@Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2;
 		@Pc(201) int local201 = 0;
 		@Pc(213) int[][] local213;
 		if (GlRenderer.enabled && arg0 != 0) {
-			local213 = Static83.anIntArrayArrayArray4[0];
+			local213 = Static83.activeTileHeightMap[0];
 			local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2);
 		}
 		local213 = null;
 		@Pc(261) long local261 = (long) (arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20);
 		if (arg3) {
-			local213 = Static107.anIntArrayArrayArray10[0];
+			local213 = Static107.surfaceTileHeightMap[0];
 		} else if (arg0 < 3) {
-			local213 = Static83.anIntArrayArrayArray4[arg0 + 1];
+			local213 = Static83.activeTileHeightMap[arg0 + 1];
 		}
 		if (local62.anInt4429 == 0 || arg3) {
 			local261 |= Long.MIN_VALUE;

client/src/main/java/Static186.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static186 {
 
 	@OriginalMember(owner = "client!pa", name = "L", descriptor = "[[B")
-	public static byte[][] aByteArrayArray14;
+	public static byte[][] underWaterMapFilesBuffer;
 
 	@OriginalMember(owner = "client!pa", name = "K", descriptor = "Z")
 	public static boolean aBoolean205 = false;
@@ -31,7 +31,7 @@ public final class Static186 {
 			return;
 		}
 		if (Static41.anInt1309 < 10) {
-			if (!Static119.aClass153_44.method4489(Static269.aClass3_Sub2_Sub4_2.aClass100_138)) {
+			if (!Static119.aClass153_44.allFilesComplete(Static269.aClass3_Sub2_Sub4_2.aClass100_138)) {
 				Static41.anInt1309 = Static227.js5Archive23.method4478(Static269.aClass3_Sub2_Sub4_2.aClass100_138) / 10;
 				return;
 			}
@@ -92,7 +92,7 @@ public final class Static186 {
 		} else if (Static41.anInt1309 == 20) {
 			Static33.method868(new Buffer(Static119.aClass153_44.fetchFile(Static166.aClass100_779, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 30;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 30) {
 			Static47.method3998(new Buffer(Static119.aClass153_44.fetchFile(Static4.aClass100_7, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
@@ -105,14 +105,14 @@ public final class Static186 {
 		} else if (Static41.anInt1309 == 50) {
 			Static166.method3166(new Buffer(Static119.aClass153_44.fetchFile(Static42.aClass100_331, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 60;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 60) {
 			if (Static119.aClass153_44.method4497(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
-				if (!Static119.aClass153_44.method4489(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
+				if (!Static119.aClass153_44.allFilesComplete(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
 					return;
 				}
-				Static203.aClass134_1 = Static140.method2711(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44);
+				Static203.aClass134_1 = Static140.createMapFunctionGroup(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44);
 			} else {
 				Static203.aClass134_1 = new Class134(0);
 			}
@@ -121,42 +121,42 @@ public final class Static186 {
 		} else if (Static41.anInt1309 == 70) {
 			Static273.aClass41_7 = new WorldMapFont(11, true, GameShell.canvas);
 			Static41.anInt1309 = 73;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 73) {
 			Static152.aClass41_3 = new WorldMapFont(12, true, GameShell.canvas);
 			Static41.anInt1309 = 76;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 76) {
 			Static169.aClass41_5 = new WorldMapFont(14, true, GameShell.canvas);
 			Static41.anInt1309 = 79;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 79) {
 			Static130.aClass41_1 = new WorldMapFont(17, true, GameShell.canvas);
 			Static41.anInt1309 = 82;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 82) {
 			Static203.aClass41_8 = new WorldMapFont(19, true, GameShell.canvas);
 			Static41.anInt1309 = 85;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 85) {
 			Static130.aClass41_2 = new WorldMapFont(22, true, GameShell.canvas);
 			Static41.anInt1309 = 88;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 88) {
 			Static270.aClass41_9 = new WorldMapFont(26, true, GameShell.canvas);
 			Static41.anInt1309 = 91;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 		} else {
 			Static160.aClass41_4 = new WorldMapFont(30, true, GameShell.canvas);
 			Static41.anInt1309 = 100;
-			Static7.method842(true);
+			Static7.ping(true);
 			Static234.method4020();
 			System.gc();
 		}

client/src/main/java/Static19.java

@@ -10,7 +10,7 @@ public final class Static19 {
 	public static int anInt636;
 
 	@OriginalMember(owner = "client!bi", name = "Y", descriptor = "[[B")
-	public static byte[][] aByteArrayArray4;
+	public static byte[][] underWaterLocationsMapFilesBuffer;
 
 	@OriginalMember(owner = "client!bi", name = "fb", descriptor = "I")
 	public static int anInt647;

client/src/main/java/Static191.java

@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static191 {
 
 	@OriginalMember(owner = "client!pg", name = "jb", descriptor = "[[B")
-	public static byte[][] aByteArrayArray15;
+	public static byte[][] npcSpawnsFilesBuffer;
 
 	@OriginalMember(owner = "client!pg", name = "fb", descriptor = "I")
 	public static final int anInt4506 = 50;

client/src/main/java/Static192.java

@@ -9,7 +9,7 @@ public final class Static192 {
 	@OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V")
 	public static void loop() {
 		while (true) {
-			@Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.method2287();
+			@Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.removeHead();
 			if (local17 == null) {
 				return;
 			}
@@ -43,7 +43,7 @@ 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.level];
+				@Pc(130) int[][] local130 = Static83.activeTileHeightMap[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];
@@ -70,13 +70,13 @@ public final class Static192 {
 				}
 				if (local159 != null) {
 					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.anInt3375 = local17.anInt1205 + Static83.loop;
 					local40.anInt3426 = local83 * 64 + local17.anInt1204 * 128;
 					local40.anInt3379 = local86 * 64 + local17.anInt1190 * 128;
 					local40.anObject5 = local159;
 					@Pc(292) int local292 = local17.anInt1188;
 					local40.anInt3406 = local157;
-					local40.anInt3390 = Static83.anInt372 + local17.anInt1187;
+					local40.anInt3390 = Static83.loop + local17.anInt1187;
 					@Pc(304) int local304 = local17.anInt1191;
 					@Pc(307) int local307 = local17.anInt1197;
 					@Pc(310) int local310 = local17.anInt1200;

client/src/main/java/Static193.java

@@ -51,7 +51,7 @@ public final class Static193 {
 	}
 
 	@OriginalMember(owner = "client!pi", name = "a", descriptor = "([[[B[[B[[B[[I[[F[[I[[B[[B[[FI[[F[[I[[I[[II)[Lclient!hg;")
-	public static Class3_Sub14[] method3501(@OriginalArg(0) byte[][][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) byte[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) float[][] arg8, @OriginalArg(9) int arg9, @OriginalArg(10) float[][] arg10, @OriginalArg(11) int[][] arg11, @OriginalArg(12) int[][] arg12, @OriginalArg(13) int[][] arg13) {
+	public static GlTile[] method3501(@OriginalArg(0) byte[][][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) byte[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) float[][] arg8, @OriginalArg(9) int arg9, @OriginalArg(10) float[][] arg10, @OriginalArg(11) int[][] arg11, @OriginalArg(12) int[][] arg12, @OriginalArg(13) int[][] arg13) {
 		@Pc(9) int[][] local9 = new int[105][105];
 		@Pc(16) int local16;
 		for (@Pc(11) int local11 = 1; local11 <= 103; local11++) {
@@ -101,17 +101,17 @@ public final class Static193 {
 					@Pc(214) long local214 = (long) local196 << 32 | (long) local155;
 					@Pc(219) int local219 = local135.length / 2;
 					@Pc(227) long local227 = (long) local155 | (long) local161 << 32;
-					@Pc(233) Class3_Sub14 local233 = (Class3_Sub14) local103.method3863(local227);
+					@Pc(233) GlTile local233 = (GlTile) local103.method3863(local227);
 					if (local233 == null) {
-						local233 = new Class3_Sub14((local161 >> 16) - 1, (float) (local161 & 0xFFFF), false, arg13 != null, local155);
+						local233 = new GlTile((local161 >> 16) - 1, (float) (local161 & 0xFFFF), false, arg13 != null, local155);
 						local103.method3862(local233, local227);
 					}
 					local233.anInt2484++;
 					local233.anInt2482 += local219;
 					if (local188 != local227) {
-						local233 = (Class3_Sub14) local103.method3863(local188);
+						local233 = (GlTile) local103.method3863(local188);
 						if (local233 == null) {
-							local233 = new Class3_Sub14((local169 >> 16) - 1, (float) (local169 & 0xFFFF), false, arg13 != null, local155);
+							local233 = new GlTile((local169 >> 16) - 1, (float) (local169 & 0xFFFF), false, arg13 != null, local155);
 							local103.method3862(local233, local188);
 						}
 						local233.anInt2484++;
@@ -119,18 +119,18 @@ public final class Static193 {
 					}
 					@Pc(340) long local340 = (long) local206 << 32 | (long) local155;
 					if (local340 != local227 && local340 != local188) {
-						local233 = (Class3_Sub14) local103.method3863(local340);
+						local233 = (GlTile) local103.method3863(local340);
 						if (local233 == null) {
-							local233 = new Class3_Sub14((local206 >> 16) - 1, (float) (local206 & 0xFFFF), false, arg13 != null, local155);
+							local233 = new GlTile((local206 >> 16) - 1, (float) (local206 & 0xFFFF), false, arg13 != null, local155);
 							local103.method3862(local233, local340);
 						}
 						local233.anInt2482 += local219;
 						local233.anInt2484++;
 					}
 					if (local214 != local227 && local188 != local214 && local214 != local340) {
-						local233 = (Class3_Sub14) local103.method3863(local214);
+						local233 = (GlTile) local103.method3863(local214);
 						if (local233 == null) {
-							local233 = new Class3_Sub14((local196 >> 16) - 1, (float) (local196 & 0xFFFF), false, arg13 != null, local155);
+							local233 = new GlTile((local196 >> 16) - 1, (float) (local196 & 0xFFFF), false, arg13 != null, local155);
 							local103.method3862(local233, local214);
 						}
 						local233.anInt2484++;
@@ -139,8 +139,8 @@ public final class Static193 {
 				}
 			}
 		}
-		@Pc(493) Class3_Sub14 local493;
+		@Pc(493) GlTile local493;
-		for (local493 = (Class3_Sub14) local103.method3859(); local493 != null; local493 = (Class3_Sub14) local103.method3861()) {
+		for (local493 = (GlTile) local103.method3859(); local493 != null; local493 = (GlTile) local103.method3861()) {
 			local493.method1940();
 		}
 		for (local16 = 1; local16 <= 102; local16++) {
@@ -238,25 +238,25 @@ public final class Static193 {
 					@Pc(963) int local963 = (local678 >> 16) - 1;
 					@Pc(969) int local969 = (local655 >> 16) - 1;
 					@Pc(975) int local975 = (local712 >> 16) - 1;
-					@Pc(981) Class3_Sub14 local981 = (Class3_Sub14) local103.method3863(local861);
+					@Pc(981) GlTile local981 = (GlTile) local103.method3863(local861);
 					Static53.method1291(arg13, local655 <= local655, Static19.method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, Static19.method588(local969, local925, local957), Static19.method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, Static19.method588(local969, local909, local939), local574);
 					@Pc(1050) int local1050 = (local754 >> 16) - 1;
 					if (local869 != local861) {
-						local981 = (Class3_Sub14) local103.method3863(local869);
+						local981 = (GlTile) local103.method3863(local869);
 						Static53.method1291(arg13, local678 <= local655, Static19.method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, Static19.method588(local963, local925, local957), Static19.method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, Static19.method588(local963, local909, local939), local574);
 					}
 					if (local877 != local861 && local877 != local869) {
-						local981 = (Class3_Sub14) local103.method3863(local877);
+						local981 = (GlTile) local103.method3863(local877);
 						Static53.method1291(arg13, local655 >= local712, Static19.method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, Static19.method588(local975, local925, local957), Static19.method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, Static19.method588(local975, local909, local939), local574);
 					}
 					if (local917 != local861 && local917 != local869 && local917 != local877) {
-						local981 = (Class3_Sub14) local103.method3863(local917);
+						local981 = (GlTile) local103.method3863(local917);
 						Static53.method1291(arg13, local754 <= local655, Static19.method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, Static19.method588(local1050, local925, local957), Static19.method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, Static19.method588(local1050, local909, local939), local574);
 					}
 				}
 			}
 		}
-		for (local493 = (Class3_Sub14) local103.method3859(); local493 != null; local493 = (Class3_Sub14) local103.method3861()) {
+		for (local493 = (GlTile) local103.method3859(); local493 != null; local493 = (GlTile) local103.method3861()) {
 			if (local493.anInt2483 == 0) {
 				local493.method4658();
 			} else {
@@ -264,7 +264,7 @@ public final class Static193 {
 			}
 		}
 		local16 = local103.method3864();
-		@Pc(1348) Class3_Sub14[] local1348 = new Class3_Sub14[local16];
+		@Pc(1348) GlTile[] local1348 = new GlTile[local16];
 		local103.method3865(local1348);
 		@Pc(1358) long[] local1358 = new long[local16];
 		for (local155 = 0; local155 < local16; local155++) {

client/src/main/java/Static195.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static195 {
 
 	@OriginalMember(owner = "client!pk", name = "R", descriptor = "[[Lclient!hg;")
-	public static Class3_Sub14[][] aClass3_Sub14ArrayArray3;
+	public static GlTile[][] underWaterHdTiles;
 
 	@OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
 	public static int anInt4581;
@@ -27,13 +27,13 @@ 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.level != local21.anInt4810 || local21.anInt4800 < Static83.anInt372) {
+			if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.loop) {
 				local16.method4658();
-			} else if (Static83.anInt372 >= local21.anInt4822) {
+			} else if (Static83.loop >= local21.anInt4822) {
 				if (local21.anInt4819 > 0) {
 					@Pc(54) Npc local54 = Static175.aClass8_Sub4_Sub2Array1[local21.anInt4819 - 1];
 					if (local54 != null && local54.anInt3412 >= 0 && local54.anInt3412 < 13312 && local54.anInt3421 >= 0 && local54.anInt3421 < 13312) {
-						local21.method3705(local54.anInt3421, Static83.anInt372, Static207.method3685(local21.anInt4810, local54.anInt3412, local54.anInt3421) - local21.anInt4805, local54.anInt3412);
+						local21.method3705(local54.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local54.anInt3412, local54.anInt3421) - local21.anInt4805, local54.anInt3412);
 					}
 				}
 				if (local21.anInt4819 < 0) {
@@ -45,7 +45,7 @@ public final class Static195 {
 						local107 = Static159.aClass8_Sub4_Sub1Array1[local102];
 					}
 					if (local107 != null && local107.anInt3412 >= 0 && local107.anInt3412 < 13312 && local107.anInt3421 >= 0 && local107.anInt3421 < 13312) {
-						local21.method3705(local107.anInt3421, Static83.anInt372, Static207.method3685(local21.anInt4810, local107.anInt3412, local107.anInt3421) - local21.anInt4805, local107.anInt3412);
+						local21.method3705(local107.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local107.anInt3412, local107.anInt3421) - local21.anInt4805, local107.anInt3412);
 					}
 				}
 				local21.method3704(Static178.anInt4247);

client/src/main/java/Static196.java

@@ -20,11 +20,11 @@ public final class Static196 {
 	public static int anInt4587 = 0;
 
 	@OriginalMember(owner = "client!pl", name = "a", descriptor = "(II)V")
-	public static void method3534(@OriginalArg(0) int arg0) {
+	public static void setGameState(@OriginalArg(0) int arg0) {
-		if (Static244.anInt5370 == arg0) {
+		if (Static244.gameState == arg0) {
 			return;
 		}
-		if (Static244.anInt5370 == 0) {
+		if (Static244.gameState == 0) {
 			Static163.method3097();
 		}
 		if (arg0 == 40) {
@@ -38,20 +38,20 @@ public final class Static196 {
 		if (arg0 == 25 || arg0 == 28) {
 			Static271.anInt5804 = 0;
 			Static230.anInt5150 = 1;
-			Static233.anInt5223 = 0;
+			Static233.loadingScreenState = 0;
 			Static38.anInt1196 = 1;
-			Static175.anInt4220 = 0;
+			Static175.mapFilesMissingCount = 0;
 			Static116.method2325(true);
 		}
 		if (arg0 == 25 || arg0 == 10) {
-			Static123.method2418();
+			Static123.topBannerRefresh();
 		}
 		if (arg0 == 5) {
 			Static181.method3344(Static209.js5Archive8);
 		} else {
 			Static119.method2381();
 		}
-		@Pc(106) boolean local106 = Static244.anInt5370 == 5 || Static244.anInt5370 == 10 || Static244.anInt5370 == 28;
+		@Pc(106) boolean local106 = Static244.gameState == 5 || Static244.gameState == 10 || Static244.gameState == 28;
 		if (local106 != local37) {
 			if (local37) {
 				Static221.anInt4363 = Static250.titleSong;
@@ -69,7 +69,7 @@ public final class Static196 {
 		if (GlRenderer.enabled && (arg0 == 25 || arg0 == 28 || arg0 == 40)) {
 			GlRenderer.method4160();
 		}
-		Static244.anInt5370 = arg0;
+		Static244.gameState = arg0;
 	}
 
 	@OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V")

client/src/main/java/Static197.java

@@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static197 {
 
 	@OriginalMember(owner = "client!pm", name = "cb", descriptor = "[[[Lclient!bj;")
-	public static Tile[][][] aClass3_Sub5ArrayArrayArray2;
+	public static Tile[][][] surfaceGroundTiles;
 
 	@OriginalMember(owner = "client!pm", name = "hb", descriptor = "I")
 	public static int anInt4620;
@@ -126,10 +126,10 @@ public final class Static197 {
 				Static260.frameBuffer = null;
 				Static260.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
 				Static129.method2492();
-				if (Static244.anInt5370 == 5) {
+				if (Static244.gameState == 5) {
 					Static182.method3359(true, Static280.aClass3_Sub2_Sub9_43);
 				} else {
-					Static114.method4636(false, LocalizedText.LOADING);
+					Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 				}
 				try {
 					@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
@@ -190,7 +190,7 @@ public final class Static197 {
 			Static95.method1939();
 			Static114.method4637();
 		}
-		Static87.aBoolean130 = !Static138.method2697();
+		Static87.aBoolean130 = !Static138.allLevelsAreVisible();
 		if (arg2) {
 			Static141.method2721();
 		}
@@ -199,10 +199,10 @@ public final class Static197 {
 		} else {
 			Static124.aBoolean156 = false;
 		}
-		if (Static154.topLevelInterace != -1) {
+		if (Static154.topLevelInterface != -1) {
 			Static210.method3712(true);
 		}
-		if (Static124.socket != null && (Static244.anInt5370 == 30 || Static244.anInt5370 == 25)) {
+		if (Static124.socket != null && (Static244.gameState == 30 || Static244.gameState == 25)) {
 			Static59.method1373();
 		}
 		for (@Pc(466) int local466 = 0; local466 < 100; local466++) {

client/src/main/java/Static198.java

@@ -56,13 +56,13 @@ public final class Static198 {
 			return;
 		}
 		@Pc(38) int local38 = Static207.method3685(Static55.level, arg5, arg2) - arg3;
-		@Pc(42) int local42 = arg2 - Static134.anInt3302;
+		@Pc(42) int local42 = arg2 - Static134.renderZ;
 		@Pc(46) int local46 = local38 - Static5.anInt40;
-		@Pc(50) int local50 = arg5 - Static138.anInt3439;
+		@Pc(50) int local50 = arg5 - Static138.renderX;
-		@Pc(54) int local54 = MathUtils.anIntArray223[Static240.anInt5333];
+		@Pc(54) int local54 = MathUtils.anIntArray223[Static240.cameraPitch];
-		@Pc(58) int local58 = MathUtils.anIntArray225[Static240.anInt5333];
+		@Pc(58) int local58 = MathUtils.anIntArray225[Static240.cameraPitch];
-		@Pc(62) int local62 = MathUtils.anIntArray223[Static184.anInt4358];
+		@Pc(62) int local62 = MathUtils.anIntArray223[Static184.cameraYaw];
-		@Pc(66) int local66 = MathUtils.anIntArray225[Static184.anInt4358];
+		@Pc(66) int local66 = MathUtils.anIntArray225[Static184.cameraYaw];
 		@Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16;
 		@Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16;
 		@Pc(89) int local89 = local76;

client/src/main/java/Static199.java

@@ -28,7 +28,7 @@ public final class Static199 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(27) byte[] local27 = Static182.aClass153_77.method4495(1, arg0);
+		@Pc(27) byte[] local27 = Static182.aClass153_77.getFile(1, arg0);
 		local10 = new FluType();
 		if (local27 != null) {
 			local10.method3217(arg0, new Buffer(local27));

client/src/main/java/Static2.java

@@ -52,7 +52,7 @@ public final class Static2 {
 				@Pc(72) HookRequest local72;
 				if (arg1 == 0 && local23.anObjectArray12 != null) {
 					local72 = new HookRequest();
-					local72.anObjectArray31 = local23.anObjectArray12;
+					local72.arguments = local23.anObjectArray12;
 					local72.source = local23;
 					Static82.method1767(local72);
 				}
@@ -64,7 +64,7 @@ public final class Static2 {
 						}
 					}
 					local72 = new HookRequest();
-					local72.anObjectArray31 = local23.anObjectArray8;
+					local72.arguments = local23.anObjectArray8;
 					local72.source = local23;
 					Static82.method1767(local72);
 				}
@@ -280,7 +280,7 @@ public final class Static2 {
 			}
 		} else if (local16 == 327) {
 			arg0.modelXAngle = 150;
-			arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF;
+			arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF;
 			arg0.modelType = 5;
 			arg0.modelId = -1;
 		} else if (local16 == 328) {
@@ -288,7 +288,7 @@ public final class Static2 {
 				arg0.modelId = 0;
 			} else {
 				arg0.modelXAngle = 150;
-				arg0.modelYAngle = (int) (Math.sin((double) Static83.anInt372 / 40.0D) * 256.0D) & 0x7FF;
+				arg0.modelYAngle = (int) (Math.sin((double) Static83.loop / 40.0D) * 256.0D) & 0x7FF;
 				arg0.modelType = 5;
 				arg0.modelId = ((int) Static173.self.aClass100_364.encode37() << 11) + 2047;
 				arg0.anInt496 = Static173.self.anInt3388;

client/src/main/java/Static202.java

@@ -96,7 +96,7 @@ public final class Static202 {
 	}
 
 	@OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V")
-	public static void method3655(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(7) Class85 local7 = Static125.method2449(arg0);
 		@Pc(10) int local10 = local7.anInt3323;
 		@Pc(16) int local16 = local7.anInt3318;
@@ -106,7 +106,7 @@ public final class Static202 {
 			arg1 = 0;
 		}
 		local25 <<= local16;
-		Static148.method2766(local19, local25 & arg1 << local16 | Static7.anIntArray75[local19] & ~local25);
+		Static148.method2766(local19, local25 & arg1 << local16 | Static7.varps[local19] & ~local25);
 	}
 
 	@OriginalMember(owner = "client!qg", name = "a", descriptor = "([Lclient!na;[SI)V")
@@ -134,7 +134,7 @@ public final class Static202 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(20) byte[] local20 = Static153.aClass153_57.method4495(33, arg0);
+		@Pc(20) byte[] local20 = Static153.aClass153_57.getFile(33, arg0);
 		local10 = new Class63();
 		if (local20 != null) {
 			local10.method2249(new Buffer(local20), arg0);

client/src/main/java/Static203.java

@@ -63,7 +63,7 @@ public final class Static203 {
 		} else {
 			GameShell.canvas.setLocation(GameShell.leftMargin, GameShell.topMargin);
 		}
-		if (Static154.topLevelInterace != -1) {
+		if (Static154.topLevelInterface != -1) {
 			Static210.method3712(true);
 		}
 		Static139.method2704();

client/src/main/java/Static207.java

@@ -19,7 +19,7 @@ public final class Static207 {
 	public static final JagString aClass100_904 = Static28.parse("::wm2");
 
 	@OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I")
-	public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) Class3_Sub14 arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) {
+	public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) {
 		@Pc(20) int local20;
 		if (arg9 == 1) {
 			local20 = arg14;
@@ -188,7 +188,7 @@ public final class Static207 {
 
 	@OriginalMember(owner = "client!ql", name = "a", descriptor = "(IIII)I")
 	public static int method3685(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		if (Static83.anIntArrayArrayArray4 == null) {
+		if (Static83.activeTileHeightMap == null) {
 			return 0;
 		}
 		@Pc(12) int local12 = arg1 >> 7;
@@ -199,11 +199,11 @@ public final class Static207 {
 		@Pc(36) int local36 = arg1 & 0x7F;
 		@Pc(40) int local40 = arg2 & 0x7F;
 		@Pc(42) int local42 = arg0;
-		if (arg0 < 3 && (Static12.aByteArrayArrayArray2[1][local12][local16] & 0x2) == 2) {
+		if (arg0 < 3 && (Static12.tileSettings[1][local12][local16] & 0x2) == 2) {
 			local42 = arg0 + 1;
 		}
-		@Pc(91) int local91 = local36 * Static83.anIntArrayArrayArray4[local42][local12 + 1][local16 + 1] + Static83.anIntArrayArrayArray4[local42][local12][local16 + 1] * (128 - local36) >> 7;
+		@Pc(91) int local91 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16 + 1] + Static83.activeTileHeightMap[local42][local12][local16 + 1] * (128 - local36) >> 7;
-		@Pc(118) int local118 = local36 * Static83.anIntArrayArrayArray4[local42][local12 + 1][local16] + (128 - local36) * Static83.anIntArrayArrayArray4[local42][local12][local16] >> 7;
+		@Pc(118) int local118 = local36 * Static83.activeTileHeightMap[local42][local12 + 1][local16] + (128 - local36) * Static83.activeTileHeightMap[local42][local12][local16] >> 7;
 		return local40 * local91 + (128 - local40) * local118 >> 7;
 	}
 }

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(GameShell.canvasHeight, arg0, Static154.topLevelInterace, GameShell.canvasWidth);
+		Static234.method4017(GameShell.canvasHeight, arg0, Static154.topLevelInterface, GameShell.canvasWidth);
 	}
 
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(Lclient!wa;Z)Lclient!bn;")

client/src/main/java/Static214.java

@@ -60,7 +60,7 @@ public final class Static214 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(26) byte[] local26 = Static58.aClass153_28.method4495(Static60.method1447(arg0), Static179.method3322(arg0));
+		@Pc(26) byte[] local26 = Static58.aClass153_28.getFile(Static60.method1447(arg0), Static179.method3322(arg0));
 		local10 = new NpcType();
 		local10.anInt3741 = arg0;
 		if (local26 != null) {

client/src/main/java/Static215.java

@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static215 {
 
 	@OriginalMember(owner = "client!rh", name = "a", descriptor = "[I")
-	public static int[] anIntArray432;
+	public static int[] intLocals;
 
 	@OriginalMember(owner = "client!rh", name = "d", descriptor = "I")
 	public static int anInt4866;

client/src/main/java/Static216.java

@@ -16,8 +16,8 @@ public final class Static216 {
 	public static final int[] anIntArray187 = new int[14];
 
 	@OriginalMember(owner = "client!ri", name = "a", descriptor = "(B)V")
-	public static void method1639() {
+	public static void handleLogin() {
-		if (Static184.anInt4348 == 0 || Static184.anInt4348 == 5) {
+		if (Static184.loginStep == 0 || Static184.loginStep == 5) {
 			return;
 		}
 		try {
@@ -27,8 +27,8 @@ public final class Static216 {
 					Static124.socket = null;
 				}
 				if (Static276.anInt5816 >= 1) {
-					Static266.anInt5336 = -5;
+					Static266.returnCode = -5;
-					Static184.anInt4348 = 0;
+					Static184.loginStep = 0;
 					return;
 				}
 				Static92.anInt2430 = 0;
@@ -37,14 +37,14 @@ public final class Static216 {
 				} else {
 					Static209.port = Static271.defaultPort;
 				}
-				Static184.anInt4348 = 1;
+				Static184.loginStep = 1;
 				Static276.anInt5816++;
 			}
-			if (Static184.anInt4348 == 1) {
+			if (Static184.loginStep == 1) {
 				Static72.aClass212_3 = GameShell.signLink.openSocket(Static60.hostname, Static209.port);
-				Static184.anInt4348 = 2;
+				Static184.loginStep = 2;
 			}
-			if (Static184.anInt4348 == 2) {
+			if (Static184.loginStep == 2) {
 				if (Static72.aClass212_3.status == 2) {
 					throw new IOException();
 				}
@@ -73,15 +73,15 @@ public final class Static216 {
 					Static147.soundChannel.method3571();
 				}
 				if (local150 != 0) {
-					Static266.anInt5336 = local150;
+					Static266.returnCode = local150;
-					Static184.anInt4348 = 0;
+					Static184.loginStep = 0;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
-				Static184.anInt4348 = 3;
+				Static184.loginStep = 3;
 			}
-			if (Static184.anInt4348 == 3) {
+			if (Static184.loginStep == 3) {
 				if (Static124.socket.available() < 8) {
 					return;
 				}
@@ -108,7 +108,7 @@ public final class Static216 {
 				}
 				Static6.outboundBuffer.encryptRsa(GlobalConfig.RSA_EXPONENT, GlobalConfig.RSA_MODULUS);
 				Static17.aClass3_Sub15_Sub1_2.offset = 0;
-				if (Static244.anInt5370 == 40) {
+				if (Static244.gameState == 40) {
 					Static17.aClass3_Sub15_Sub1_2.p1(18);
 				} else {
 					Static17.aClass3_Sub15_Sub1_2.p1(16);
@@ -171,72 +171,72 @@ public final class Static216 {
 					local210[local583] += 50;
 				}
 				Static57.aClass3_Sub15_Sub1_3.method2240(local210);
-				Static184.anInt4348 = 4;
+				Static184.loginStep = 4;
 			}
-			if (Static184.anInt4348 == 4) {
+			if (Static184.loginStep == 4) {
 				if (Static124.socket.available() < 1) {
 					return;
 				}
 				@Pc(623) int local623 = Static124.socket.read();
 				if (local623 == 21) {
-					Static184.anInt4348 = 7;
+					Static184.loginStep = 7;
 				} else if (local623 == 29) {
-					Static184.anInt4348 = 10;
+					Static184.loginStep = 10;
 				} else if (local623 == 1) {
-					Static184.anInt4348 = 5;
+					Static184.loginStep = 5;
-					Static266.anInt5336 = local623;
+					Static266.returnCode = local623;
 					return;
 				} else if (local623 == 2) {
-					Static184.anInt4348 = 8;
+					Static184.loginStep = 8;
 				} else if (local623 == 15) {
-					Static184.anInt4348 = 0;
+					Static184.loginStep = 0;
-					Static266.anInt5336 = local623;
+					Static266.returnCode = local623;
 					return;
 				} else if (local623 == 23 && Static276.anInt5816 < 1) {
-					Static184.anInt4348 = 1;
+					Static184.loginStep = 1;
 					Static276.anInt5816++;
 					Static92.anInt2430 = 0;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				} else {
-					Static266.anInt5336 = local623;
+					Static266.returnCode = local623;
-					Static184.anInt4348 = 0;
+					Static184.loginStep = 0;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
 			}
-			if (Static184.anInt4348 == 6) {
+			if (Static184.loginStep == 6) {
 				Static6.outboundBuffer.offset = 0;
 				Static6.outboundBuffer.p1isaac(17);
 				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
-				Static184.anInt4348 = 4;
+				Static184.loginStep = 4;
 				return;
 			}
-			if (Static184.anInt4348 == 7) {
+			if (Static184.loginStep == 7) {
 				if (Static124.socket.available() >= 1) {
 					Static231.anInt5202 = (Static124.socket.read() + 3) * 60;
-					Static184.anInt4348 = 0;
+					Static184.loginStep = 0;
-					Static266.anInt5336 = 21;
+					Static266.returnCode = 21;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
 				return;
 			}
-			if (Static184.anInt4348 == 10) {
+			if (Static184.loginStep == 10) {
 				if (Static124.socket.available() >= 1) {
 					Static204.anInt4765 = Static124.socket.read();
-					Static184.anInt4348 = 0;
+					Static184.loginStep = 0;
-					Static266.anInt5336 = 29;
+					Static266.returnCode = 29;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
 				return;
 			}
-			if (Static184.anInt4348 == 8) {
+			if (Static184.loginStep == 8) {
 				if (Static124.socket.available() < 14) {
 					return;
 				}
@@ -269,16 +269,16 @@ public final class Static216 {
 				}
 				Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243();
 				Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2();
-				Static184.anInt4348 = 9;
+				Static184.loginStep = 9;
 			}
-			if (Static184.anInt4348 == 9) {
+			if (Static184.loginStep == 9) {
 				if (Static124.socket.available() < Static223.anInt5028) {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
 				Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
-				Static266.anInt5336 = 2;
+				Static266.returnCode = 2;
-				Static184.anInt4348 = 0;
+				Static184.loginStep = 0;
 				Static243.method4221();
 				Static80.anInt4701 = -1;
 				Static75.method1629(false);
@@ -291,10 +291,10 @@ public final class Static216 {
 				Static124.socket = null;
 			}
 			if (Static276.anInt5816 >= 1) {
-				Static184.anInt4348 = 0;
+				Static184.loginStep = 0;
-				Static266.anInt5336 = -4;
+				Static266.returnCode = -4;
 			} else {
-				Static184.anInt4348 = 1;
+				Static184.loginStep = 1;
 				Static92.anInt2430 = 0;
 				Static276.anInt5816++;
 				if (Static271.defaultPort == Static209.port) {

client/src/main/java/Static217.java

@@ -164,7 +164,7 @@ public final class Static217 {
 						@Pc(154) CollisionMap local154 = null;
 						if (!arg7) {
 							@Pc(159) int local159 = arg1;
-							if ((Static12.aByteArrayArrayArray2[1][local120][local137] & 0x2) == 2) {
+							if ((Static12.tileSettings[1][local120][local137] & 0x2) == 2) {
 								local159 = arg1 - 1;
 							}
 							if (local159 >= 0) {

client/src/main/java/Static220.java

@@ -11,13 +11,13 @@ public final class Static220 {
 	public static final SoftLruHashTable aClass99_28 = new SoftLruHashTable(64);
 
 	@OriginalMember(owner = "client!rm", name = "g", descriptor = "Z")
-	public static boolean aBoolean244 = true;
+	public static boolean highWaterDetail = true;
 
 	@OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;")
 	public static final JagString aClass100_930 = Static28.parse("(Z");
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V")
-	public static void method3797(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Static55.level][arg1][arg0];
 		if (local9 == null) {
 			Static187.method3420(Static55.level, arg1, arg0);
@@ -112,8 +112,8 @@ public final class Static220 {
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V")
 	public static void method3801() {
 		for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) {
-			for (@Pc(6) int local6 = 0; local6 < Static152.anInt3594; local6++) {
+			for (@Pc(6) int local6 = 0; local6 < Static152.mapSizeX; local6++) {
-				for (@Pc(11) int local11 = 0; local11 < Static99.anInt2550; local11++) {
+				for (@Pc(11) int local11 = 0; local11 < Static99.mapSizeZ; local11++) {
 					@Pc(22) Tile local22 = Static130.aClass3_Sub5ArrayArrayArray1[local1][local6][local11];
 					if (local22 != null) {
 						@Pc(27) Wall local27 = local22.aClass77_1;

client/src/main/java/Static225.java

@@ -35,7 +35,7 @@ public final class Static225 {
 					}
 					Static105.anIntArray256[Static267.anInt5774++] = local20;
 					@Pc(65) Player local65 = Static159.aClass8_Sub4_Sub1Array1[local20];
-					local65.anInt3430 = Static83.anInt372;
+					local65.anInt3430 = Static83.loop;
 					@Pc(73) int local73 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
 					if (local73 == 1) {
 						Static44.anIntArray106[Static116.anInt2951++] = local20;
@@ -83,11 +83,11 @@ public final class Static225 {
 		Static5.anInt39 = arg2;
 		Static186.username = arg0;
 		if (Static186.username.method3108(Static186.EMPTY_FILE) || Static186.password.method3108(Static186.EMPTY_FILE)) {
-			Static266.anInt5336 = 3;
+			Static266.returnCode = 3;
 		} else if (Static125.worldId == -1) {
 			Static20.anInt673 = 0;
 			Static196.anInt4587 = 0;
-			Static266.anInt5336 = -3;
+			Static266.returnCode = -3;
 			Static219.anInt4937 = 1;
 			@Pc(43) Buffer local43 = new Buffer(128);
 			local43.p1(10);

client/src/main/java/Static227.java

@@ -12,7 +12,7 @@ public final class Static227 {
 	public static Js5 js5Archive23;
 
 	@OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
-	public static int anInt5096;
+	public static int cameraType;
 
     @OriginalMember(owner = "client!sg", name = "b", descriptor = "[I")
 	public static final int[] anIntArray446 = new int[25];

client/src/main/java/Static23.java

@@ -30,21 +30,21 @@ public final class Static23 {
 		for (local3 = arg1; local3 < arg3 + arg1; local3++) {
 			for (local10 = arg2; local10 < arg2 + arg4; local10++) {
 				if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
-					Static83.anIntArrayArrayArray4[arg0][local10][local3] = arg0 <= 0 ? 0 : Static83.anIntArrayArrayArray4[arg0 - 1][local10][local3];
+					Static83.activeTileHeightMap[arg0][local10][local3] = arg0 <= 0 ? 0 : Static83.activeTileHeightMap[arg0 - 1][local10][local3];
 				}
 			}
 		}
 		if (arg2 > 0 && arg2 < 104) {
 			for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) {
 				if (local3 >= 0 && local3 < 104) {
-					Static83.anIntArrayArrayArray4[arg0][arg2][local3] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][local3];
+					Static83.activeTileHeightMap[arg0][arg2][local3] = Static83.activeTileHeightMap[arg0][arg2 - 1][local3];
 				}
 			}
 		}
 		if (arg1 > 0 && arg1 < 104) {
 			for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) {
 				if (local3 >= 0 && local3 < 104) {
-					Static83.anIntArrayArrayArray4[arg0][local3][arg1] = Static83.anIntArrayArrayArray4[arg0][local3][arg1 - 1];
+					Static83.activeTileHeightMap[arg0][local3][arg1] = Static83.activeTileHeightMap[arg0][local3][arg1 - 1];
 				}
 			}
 		}
@@ -52,19 +52,19 @@ public final class Static23 {
 			return;
 		}
 		if (arg0 == 0) {
-			if (arg2 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1] != 0) {
+			if (arg2 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1] != 0) {
-				Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1];
+				Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1];
-			} else if (arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1] != 0) {
+			} else if (arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2][arg1 - 1] != 0) {
-				Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1];
+				Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2][arg1 - 1];
-			} else if (arg2 > 0 && arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1] != 0) {
+			} else if (arg2 > 0 && arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != 0) {
-				Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1];
+				Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1];
 			}
-		} else if (arg2 > 0 && Static83.anIntArrayArrayArray4[arg0 - 1][arg2 - 1][arg1] != Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1]) {
+		} else if (arg2 > 0 && Static83.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1] != Static83.activeTileHeightMap[arg0][arg2 - 1][arg1]) {
-			Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1];
+			Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1];
-		} else if (arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1] != Static83.anIntArrayArrayArray4[arg0 - 1][arg2][arg1 - 1]) {
+		} else if (arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2][arg1 - 1] != Static83.activeTileHeightMap[arg0 - 1][arg2][arg1 - 1]) {
-			Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2][arg1 - 1];
+			Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2][arg1 - 1];
-		} else if (arg2 > 0 && arg1 > 0 && Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1] != Static83.anIntArrayArrayArray4[arg0 - 1][arg2 - 1][arg1 - 1]) {
+		} else if (arg2 > 0 && arg1 > 0 && Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1] != Static83.activeTileHeightMap[arg0 - 1][arg2 - 1][arg1 - 1]) {
-			Static83.anIntArrayArrayArray4[arg0][arg2][arg1] = Static83.anIntArrayArrayArray4[arg0][arg2 - 1][arg1 - 1];
+			Static83.activeTileHeightMap[arg0][arg2][arg1] = Static83.activeTileHeightMap[arg0][arg2 - 1][arg1 - 1];
 		}
 	}
 

client/src/main/java/Static230.java

@@ -21,7 +21,7 @@ public final class Static230 {
 	public static int anInt5152 = 0;
 
 	@OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
-	public static boolean aBoolean250 = false;
+	public static boolean dynamicMapRegion = false;
 
 	@OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
 	public static final JagString aClass100_978 = Static28.parse("<)4col>");
@@ -132,9 +132,9 @@ public final class Static230 {
 		}
 		@Pc(27) byte[] local27;
 		if (arg0 < 32768) {
-			local27 = Static238.aClass153_96.method4495(1, arg0);
+			local27 = Static238.aClass153_96.getFile(1, arg0);
 		} else {
-			local27 = Static262.aClass153_108.method4495(1, arg0 & 0x7FFF);
+			local27 = Static262.aClass153_108.getFile(1, arg0 & 0x7FFF);
 		}
 		local10 = new Class3_Sub2_Sub6();
 		if (local27 != null) {

client/src/main/java/Static233.java

@@ -38,7 +38,7 @@ public final class Static233 {
 	public static boolean aBoolean254 = false;
 
 	@OriginalMember(owner = "client!t", name = "y", descriptor = "I")
-	public static int anInt5223 = 0;
+	public static int loadingScreenState = 0;
 
 	@OriginalMember(owner = "client!t", name = "z", descriptor = "I")
 	public static int anInt5224 = 0;
@@ -65,7 +65,7 @@ public final class Static233 {
 			@Pc(17) Class102 local17 = local5[local3];
 			if (local17 != null && local17.anInt4058 == 2) {
 				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) {
+				if (Static65.anInt1951 > -1 && Static83.loop % 20 < 10) {
 					Static276.aClass3_Sub2_Sub1Array11[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
 				}
 			}
@@ -85,11 +85,11 @@ public final class Static233 {
 		@Pc(19) byte local19;
 		@Pc(21) byte[][] local21;
 		if (GlRenderer.enabled && arg0) {
-			local21 = Static19.aByteArrayArray4;
+			local21 = Static19.underWaterLocationsMapFilesBuffer;
 			local19 = 1;
 		} else {
 			local19 = 4;
-			local21 = Static156.aByteArrayArray11;
+			local21 = Static156.locationMapFilesBuffer;
 		}
 		for (@Pc(29) int local29 = 0; local29 < local19; local29++) {
 			Static107.method2261();
@@ -103,8 +103,8 @@ public final class Static233 {
 							@Pc(83) int local83 = local56 >> 14 & 0x3FF;
 							@Pc(89) int local89 = local56 >> 3 & 0x7FF;
 							@Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8);
-							for (@Pc(101) int local101 = 0; local101 < Static238.anIntArray470.length; local101++) {
+							for (@Pc(101) int local101 = 0; local101 < Static238.regionBitPacked.length; local101++) {
-								if (Static238.anIntArray470[local101] == local99 && local21[local101] != null) {
+								if (Static238.regionBitPacked[local101] == local99 && local21[local101] != null) {
 									Static217.method3771(Static148.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
 									break;
 								}

client/src/main/java/Static234.java

@@ -30,14 +30,14 @@ public final class Static234 {
 			if ((local18 & 0x40) != 0) {
 				local43 = Static57.aClass3_Sub15_Sub1_3.g1();
 				local47 = Static57.aClass3_Sub15_Sub1_3.p1neg();
-				local14.method2686(local47, Static83.anInt372, local43);
+				local14.method2686(local47, Static83.loop, local43);
-				local14.anInt3378 = Static83.anInt372 + 300;
+				local14.anInt3378 = Static83.loop + 300;
 				local14.anInt3372 = Static57.aClass3_Sub15_Sub1_3.g1ssub();
 			}
 			if ((local18 & 0x2) != 0) {
 				local43 = Static57.aClass3_Sub15_Sub1_3.p1neg();
 				local47 = Static57.aClass3_Sub15_Sub1_3.g1ssub();
-				local14.method2686(local47, Static83.anInt372, local43);
+				local14.method2686(local47, Static83.loop, local43);
 			}
 			if ((local18 & 0x10) != 0) {
 				local43 = Static57.aClass3_Sub15_Sub1_3.g2();
@@ -65,15 +65,15 @@ public final class Static234 {
 				}
 				if (local147) {
 					local14.anInt3432 = local43;
-					local14.anInt3359 = (local47 & 0xFFFF) + Static83.anInt372;
+					local14.anInt3359 = (local47 & 0xFFFF) + Static83.loop;
 					local14.anInt3361 = 0;
 					local14.anInt3399 = 0;
 					local14.anInt3394 = local47 >> 16;
 					local14.anInt3418 = 1;
-					if (local14.anInt3359 > Static83.anInt372) {
+					if (local14.anInt3359 > Static83.loop) {
 						local14.anInt3399 = -1;
 					}
-					if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.anInt372) {
+					if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) {
 						@Pc(227) int local227 = Static34.method877(local14.anInt3432).anInt1754;
 						if (local227 != -1) {
 							@Pc(236) SeqType local236 = Static36.method941(local227);
@@ -124,7 +124,7 @@ public final class Static234 {
 
 	@OriginalMember(owner = "client!ta", name = "a", descriptor = "(Lclient!ve;III)Z")
 	public static boolean method4016(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(9) byte[] local9 = arg0.method4495(arg2, arg1);
+		@Pc(9) byte[] local9 = arg0.getFile(arg2, arg1);
 		if (local9 == null) {
 			return false;
 		} else {
@@ -149,7 +149,7 @@ public final class Static234 {
 		@Pc(25) int local25 = Static119.aClass153_44.getGroupId(Static54.aClass100_374);
 		@Pc(30) int[] local30 = Static119.aClass153_44.method4503(local25);
 		for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
-			Static228.aClass69_120.method2282(Static210.method3713(new Buffer(Static119.aClass153_44.method4495(local25, local30[local32]))));
+			Static228.aClass69_120.method2282(Static210.method3713(new Buffer(Static119.aClass153_44.getFile(local25, local30[local32]))));
 		}
 	}
 

client/src/main/java/Static235.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static235 {
 
 	@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
-	public static Class134 aClass134_2;
+	public static Class134 mapFunctionGroup;
 
 	@OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1002 = Static28.parse("(U5");
@@ -26,9 +26,9 @@ public final class Static235 {
 		}
 		@Pc(24) byte[] local24;
 		if (arg0 < 32768) {
-			local24 = Static87.aClass153_38.method4495(0, arg0);
+			local24 = Static87.aClass153_38.getFile(0, arg0);
 		} else {
-			local24 = Static29.aClass153_19.method4495(0, arg0 & 0x7FFF);
+			local24 = Static29.aClass153_19.getFile(0, arg0 & 0x7FFF);
 		}
 		local10 = new Class3_Sub2_Sub2();
 		if (local24 != null) {

client/src/main/java/Static236.java

@@ -8,7 +8,7 @@ public final class Static236 {
 	public static int method4047() {
 		if (Static127.aBoolean160) {
 			return 0;
-		} else if (Static138.method2697()) {
+		} else if (Static138.allLevelsAreVisible()) {
 			return Static80.aBoolean231 ? 2 : 1;
 		} else {
 			return 1;

client/src/main/java/Static238.java

@@ -8,7 +8,7 @@ public final class Static238 {
 	public static Js5 aClass153_96;
 
 	@OriginalMember(owner = "client!te", name = "H", descriptor = "[I")
-	public static int[] anIntArray470;
+	public static int[] regionBitPacked;
 
 	@OriginalMember(owner = "client!te", name = "B", descriptor = "[I")
 	public static final int[] anIntArray469 = new int[] { 0, -1, 0, 1 };

client/src/main/java/Static240.java

@@ -7,7 +7,7 @@ public final class Static240 {
 	public static FontMetrics aFontMetrics1;
 
 	@OriginalMember(owner = "client!tg", name = "b", descriptor = "I")
-	public static int anInt5333;
+	public static int cameraPitch;
 
 	@OriginalMember(owner = "client!tg", name = "c", descriptor = "I")
 	public static int screenLowerX;

client/src/main/java/Static242.java

@@ -6,10 +6,10 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static242 {
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "Lclient!ek;")
-	public static SoftwareIndexedSprite aClass36_Sub1_4;
+	public static SoftwareIndexedSprite shadowMapImage;
 
 	@OriginalMember(owner = "client!tj", name = "b", descriptor = "[[Lclient!wm;")
-	public static Class165[][] aClass165ArrayArray1;
+	public static Class165[][] shadows;
 
 	@OriginalMember(owner = "client!tj", name = "c", descriptor = "I")
 	private static int anInt5345;
@@ -97,7 +97,7 @@ public final class Static242 {
 		@Pc(31) int local31 = arg1 + arg3 - 1 - 1 >> 7;
 		for (@Pc(33) int local33 = local5; local33 <= local15; local33++) {
 			for (@Pc(38) int local38 = local21; local38 <= local31; local38++) {
-				aClass165ArrayArray1[local33][local38].aBoolean313 = true;
+				shadows[local33][local38].outputToSprite = true;
 			}
 		}
 	}
@@ -113,9 +113,9 @@ public final class Static242 {
 		@Pc(43) int local43 = local19 - (local29 * Static161.anInt3920 >> 8) >> 3;
 		@Pc(53) int local53 = local33 - (local29 * Static161.anInt3921 >> 8) >> 3;
 		if (arg0 != 0 && arg0 != 1 && (arg2 || arg3)) {
-			method4210(aClass36_Sub1Array2[arg0], aClass36_Sub1_4, local43 + 1, local53 + 1, arg1, arg2);
+			method4210(aClass36_Sub1Array2[arg0], shadowMapImage, local43 + 1, local53 + 1, arg1, arg2);
 		} else {
-			method4194(aClass36_Sub1Array2[1], aClass36_Sub1_4, local43 + 1, local53 + 1);
+			method4194(aClass36_Sub1Array2[1], shadowMapImage, local43 + 1, local53 + 1);
 		}
 	}
 
@@ -134,10 +134,10 @@ public final class Static242 {
 					if (local29 - arg0 >= -arg2 && local29 - arg0 <= arg2) {
 						for (@Pc(51) int local51 = local22 * 8; local51 < local22 * 8 + 8; local51++) {
 							if (local51 - arg1 >= -arg2 && local51 - arg1 <= arg2 && arg4[local29 + arg2 - arg0][local51 + arg2 - arg1]) {
-								@Pc(89) Class165 local89 = aClass165ArrayArray1[local17][local22];
+								@Pc(89) Class165 local89 = shadows[local17][local22];
-								if (local89.aBoolean313) {
+								if (local89.outputToSprite) {
-									local89.method4677(aClass36_Sub1_4, local17, local22);
+									local89.method4677(shadowMapImage, local17, local22);
-									local89.aBoolean313 = false;
+									local89.outputToSprite = false;
 								}
 								local1.glPushMatrix();
 								local1.glTranslatef((float) (local17 * 1024), 0.0F, (float) (local22 * 1024));
@@ -226,11 +226,11 @@ public final class Static242 {
 	public static void method4201() {
 		anInt5346 = 13;
 		anInt5345 = 13;
-		aClass36_Sub1_4 = new SoftwareIndexedSprite(anInt5346 * 128 + 2, anInt5345 * 128 + 2, 0);
+		shadowMapImage = new SoftwareIndexedSprite(anInt5346 * 128 + 2, anInt5345 * 128 + 2, 0);
-		aClass165ArrayArray1 = new Class165[anInt5346][anInt5345];
+		shadows = new Class165[anInt5346][anInt5345];
 		for (@Pc(32) int local32 = 0; local32 < anInt5346; local32++) {
 			for (@Pc(37) int local37 = 0; local37 < anInt5345; local37++) {
-				aClass165ArrayArray1[local32][local37] = new Class165();
+				shadows[local32][local37] = new Class165();
 			}
 		}
 	}
@@ -280,9 +280,9 @@ public final class Static242 {
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "()V")
 	public static void method4203() {
-		aClass36_Sub1_4 = null;
+		shadowMapImage = null;
 		aClass36_Sub1Array2 = null;
-		aClass165ArrayArray1 = null;
+		shadows = null;
 	}
 
 	@OriginalMember(owner = "client!tj", name = "b", descriptor = "([B[BIIIIII)V")
@@ -338,7 +338,7 @@ public final class Static242 {
 		if (arg0 != null) {
 			@Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3;
 			@Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3;
-			method4202(arg0, aClass36_Sub1_4, local12 + 1, local22 + 1);
+			method4202(arg0, shadowMapImage, local12 + 1, local22 + 1);
 		}
 	}
 
@@ -371,7 +371,7 @@ public final class Static242 {
 		} else {
 			@Pc(13) int local13 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3;
 			@Pc(23) int local23 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3;
-			return method4200(arg0, aClass36_Sub1_4, local13 + 1, local23 + 1);
+			return method4200(arg0, shadowMapImage, local13 + 1, local23 + 1);
 		}
 	}
 
@@ -415,7 +415,7 @@ public final class Static242 {
 		if (arg0 != null) {
 			@Pc(12) int local12 = arg1 - (arg2 * Static161.anInt3920 >> 8) >> 3;
 			@Pc(22) int local22 = arg3 - (arg2 * Static161.anInt3921 >> 8) >> 3;
-			method4194(arg0, aClass36_Sub1_4, local12 + 1, local22 + 1);
+			method4194(arg0, shadowMapImage, local12 + 1, local22 + 1);
 		}
 	}
 }

client/src/main/java/Static243.java

@@ -20,11 +20,11 @@ public final class Static243 {
 	public static int[] anIntArray476 = new int[2];
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;")
-	public static Class3_Sub14 method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) {
+	public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) {
 		@Pc(23) long local23 = (long) ((arg1.anInt5892 + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32);
-		@Pc(38) Class3_Sub14 local38 = (Class3_Sub14) arg0.method3863(local23);
+		@Pc(38) GlTile local38 = (GlTile) arg0.method3863(local23);
 		if (local38 == null) {
-			local38 = new Class3_Sub14(arg1.anInt5892, (float) arg1.anInt5885, true, false, arg1.anInt5889);
+			local38 = new GlTile(arg1.anInt5892, (float) arg1.anInt5885, true, false, arg1.anInt5889);
 			arg0.method3862(local38, local23);
 		}
 		return local38;
@@ -60,7 +60,7 @@ public final class Static243 {
 		Static260.anInt5014 = 0;
 		Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50;
 		Static84.anInt2255 = 0;
-		Static57.anInt1747 = (int) (Math.random() * 20.0D) - 10 & 0x7FF;
+		Static57.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF;
 		Static107.anInt2875 = -1;
 		Static267.anInt5774 = 0;
 		Static270.anInt5795 = 0;
@@ -110,13 +110,13 @@ public final class Static243 {
 		for (local3506 = 0; local3506 < Static155.varcs.length; local3506++) {
 			Static155.varcs[local3506] = -1;
 		}
-		if (Static154.topLevelInterace != -1) {
+		if (Static154.topLevelInterface != -1) {
-			Static109.method2275(Static154.topLevelInterace);
+			Static109.method2275(Static154.topLevelInterface);
 		}
 		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.topLevelInterace = -1;
+		Static154.topLevelInterface = -1;
 		Static119.aClass133_9 = new HashTable(8);
 		Static52.method1287();
 		Static39.aClass13_10 = null;

client/src/main/java/Static244.java

@@ -8,7 +8,7 @@ public final class Static244 {
 	public static final SoftLruHashTable aClass99_32 = new SoftLruHashTable(50);
 
 	@OriginalMember(owner = "client!tl", name = "d", descriptor = "I")
-	public static int anInt5370 = 0;
+	public static int gameState = 0;
 
 
 	@OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;")

client/src/main/java/Static245.java

@@ -37,7 +37,7 @@ public final class Static245 {
 			}
 			for (@Pc(46) int local46 = 0; local46 < local25; local46++) {
 				if (Static241.components[arg0][local46] == null) {
-					@Pc(62) byte[] local62 = Static202.aClass153_84.method4495(arg0, local46);
+					@Pc(62) byte[] local62 = Static202.aClass153_84.getFile(arg0, local46);
 					if (local62 != null) {
 						@Pc(74) Component local74 = Static241.components[arg0][local46] = new Component();
 						local74.anInt507 = local46 + (arg0 << 16);
@@ -210,8 +210,8 @@ public final class Static245 {
 						local417 = local517.anInt2240 >> 7;
 						local255 = local517.anInt2245 >> 7;
 						if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) {
-							local517.aBoolean125 = (Static12.aByteArrayArrayArray2[1][local417][local255] & 0x2) != 0;
+							local517.aBoolean125 = (Static12.tileSettings[1][local417][local255] & 0x2) != 0;
-							local517.anInt2235 = Static83.anIntArrayArrayArray4[local517.anInt2241][local417][local255] - local517.anInt2235;
+							local517.anInt2235 = Static83.activeTileHeightMap[local517.anInt2241][local417][local255] - local517.anInt2235;
 							Static120.method2389(local517);
 						}
 					}

client/src/main/java/Static246.java

@@ -25,7 +25,7 @@ public final class Static246 {
 			@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
 			if (local15.anInt606 != Static55.level || local15.aBoolean41) {
 				local9.method4658();
-			} else if (local15.anInt590 <= Static83.anInt372) {
+			} else if (local15.anInt590 <= Static83.loop) {
 				local15.method558(Static178.anInt4247);
 				if (local15.aBoolean41) {
 					local9.method4658();
@@ -135,7 +135,7 @@ public final class Static246 {
 		if (local16 != null) {
 			return local16;
 		}
-		@Pc(27) byte[] local27 = Static9.aClass153_2.method4495(5, arg0);
+		@Pc(27) byte[] local27 = Static9.aClass153_2.getFile(5, arg0);
 		local16 = new Class3_Sub2_Sub14();
 		if (local27 != null) {
 			local16.method2927(new Buffer(local27));

client/src/main/java/Static247.java

@@ -59,7 +59,7 @@ public final class Static247 {
 										@Pc(1179) Tile var32;
 										while (true) {
 											do {
-												local8 = (Tile) Static7.aClass69_32.method2287();
+												local8 = (Tile) Static7.aClass69_32.removeHead();
 												if (local8 == null) {
 													return;
 												}
@@ -71,7 +71,7 @@ public final class Static247 {
 											local31 = Static130.aClass3_Sub5ArrayArrayArray1[local24];
 											@Pc(33) float local33 = 0.0F;
 											if (GlRenderer.enabled) {
-												if (Static80.anIntArrayArrayArray19 == Static83.anIntArrayArrayArray4) {
+												if (Static80.underWaterTileHeightMap == Static83.activeTileHeightMap) {
 													var9 = Static62.anIntArrayArray11[local18][local21];
 													var10 = var9 & 0xFFFFFF;
 													if (var10 != Static152.anInt3604) {
@@ -84,7 +84,7 @@ public final class Static247 {
 														Static22.anInt730 = local65;
 														Static147.method2761(local65);
 													}
-													local115 = Static107.anIntArrayArrayArray10[0][local18][local21] + Static107.anIntArrayArrayArray10[0][local18 + 1][local21] + Static107.anIntArrayArrayArray10[0][local18][local21 + 1] + Static107.anIntArrayArrayArray10[0][local18 + 1][local21 + 1] >> 2;
+													local115 = Static107.surfaceTileHeightMap[0][local18][local21] + Static107.surfaceTileHeightMap[0][local18 + 1][local21] + Static107.surfaceTileHeightMap[0][local18][local21 + 1] + Static107.surfaceTileHeightMap[0][local18 + 1][local21 + 1] >> 2;
 													Static27.setMaterial(-local115, 3);
 													local33 = 201.5F;
 													GlRenderer.method4159(local33);
@@ -377,21 +377,21 @@ public final class Static247 {
 																if (local1332 == 0) {
 																	local65 -= 64;
 																	local115 += 64;
-																	if (local115 < local65 && local18 > 0 && local21 < Static99.anInt2550 - 1) {
+																	if (local115 < local65 && local18 > 0 && local21 < Static99.mapSizeZ - 1) {
 																		Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1);
 																		break label882;
 																	}
 																} else if (local1332 == 1) {
 																	local65 += 64;
 																	local115 += 64;
-																	if (local115 < -local65 && local18 < Static152.anInt3594 - 1 && local21 < Static99.anInt2550 - 1) {
+																	if (local115 < -local65 && local18 < Static152.mapSizeX - 1 && local21 < Static99.mapSizeZ - 1) {
 																		Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1);
 																		break label882;
 																	}
 																} else if (local1332 == 2) {
 																	local65 += 64;
 																	local115 -= 64;
-																	if (local115 > local65 && local18 < Static152.anInt3594 - 1 && local21 > 0) {
+																	if (local115 > local65 && local18 < Static152.mapSizeX - 1 && local21 > 0) {
 																		Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1);
 																		break label882;
 																	}
@@ -664,7 +664,7 @@ public final class Static247 {
 		if (local8 != null && local8.anObjectArray11 != null) {
 			@Pc(19) HookRequest local19 = new HookRequest();
 			local19.source = local8;
-			local19.anObjectArray31 = local8.anObjectArray11;
+			local19.arguments = local8.anObjectArray11;
 			Static82.method1767(local19);
 		}
 		Static15.anInt506 = arg1;
@@ -688,7 +688,7 @@ public final class Static247 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(20) byte[] local20 = Static81.aClass153_34.method4495(16, arg0);
+		@Pc(20) byte[] local20 = Static81.aClass153_34.getFile(16, arg0);
 		local10 = new Class35();
 		if (local20 != null) {
 			local10.method1323(new Buffer(local20));

client/src/main/java/Static248.java

@@ -51,7 +51,7 @@ public final class Static248 {
 				for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) {
 					@Pc(46) Tile local46 = local30[local32][local37];
 					if (local46 != null) {
-						if (Static48.aBooleanArrayArray1[local32 + Static277.anInt5855 - Static167.anInt4069][local37 + Static277.anInt5855 - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
+						if (Static48.aBooleanArrayArray1[local32 + Static277.tileVisibilityDistance - Static167.anInt4069][local37 + Static277.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
 							local46.aBoolean45 = true;
 							local46.aBoolean46 = true;
 							if (local46.anInt662 > 0) {
@@ -95,7 +95,7 @@ public final class Static248 {
 				}
 			}
 		}
-		@Pc(240) boolean local240 = Static83.anIntArrayArrayArray4 == Static80.anIntArrayArrayArray19;
+		@Pc(240) boolean local240 = Static83.activeTileHeightMap == Static80.underWaterTileHeightMap;
 		if (GlRenderer.enabled) {
 			@Pc(244) GL2 local244 = GlRenderer.gl;
 			local244.glPushMatrix();
@@ -108,7 +108,7 @@ public final class Static248 {
 				Static152.anInt3604 = -1;
 				Static22.anInt730 = -1;
 				for (local32 = 0; local32 < Static182.aClass3_Sub14ArrayArray2[0].length; local32++) {
-					@Pc(285) Class3_Sub14 local285 = Static182.aClass3_Sub14ArrayArray2[0][local32];
+					@Pc(285) GlTile local285 = Static182.aClass3_Sub14ArrayArray2[0][local32];
 					@Pc(294) float local294 = 251.5F - (local285.aBoolean140 ? 1.0F : 0.5F);
 					if (local285.anInt2486 != Static152.anInt3604) {
 						Static152.anInt3604 = local285.anInt2486;
@@ -126,16 +126,16 @@ public final class Static248 {
 						break;
 					}
 					for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) {
-						@Pc(336) Class3_Sub14 local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37];
+						@Pc(336) GlTile local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37];
 						@Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.aBoolean140 ? 1.0F : 0.5F);
-						if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Static220.aBoolean244) {
+						if (local336.anInt2485 != -1 && Rasteriser.textureProvider.method3237(local336.anInt2485) == 4 && Static220.highWaterDetail) {
 							Static21.method619(local336.anInt2486);
 						}
 						local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false);
 					}
 					if (local32 == 0 && Static139.anInt3451 > 0) {
 						GlRenderer.method4159(101.5F);
-						Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.anInt5855, arg1, Static48.aBooleanArrayArray1, Static83.anIntArrayArrayArray4[0]);
+						Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.tileVisibilityDistance, arg1, Static48.aBooleanArrayArray1, Static83.activeTileHeightMap[0]);
 					}
 					local32++;
 				}
@@ -151,11 +151,11 @@ public final class Static248 {
 		@Pc(428) int local428;
 		for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) {
 			local406 = Static130.aClass3_Sub5ArrayArrayArray1[local399];
-			for (local37 = -Static277.anInt5855; local37 <= 0; local37++) {
+			for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) {
 				local415 = Static167.anInt4069 + local37;
 				local183 = Static167.anInt4069 - local37;
 				if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) {
-					for (local428 = -Static277.anInt5855; local428 <= 0; local428++) {
+					for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) {
 						local434 = Static193.anInt4539 + local428;
 						local438 = Static193.anInt4539 - local428;
 						if (local415 >= Static31.anInt987) {
@@ -198,11 +198,11 @@ public final class Static248 {
 		}
 		for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) {
 			local406 = Static130.aClass3_Sub5ArrayArrayArray1[local399];
-			for (local37 = -Static277.anInt5855; local37 <= 0; local37++) {
+			for (local37 = -Static277.tileVisibilityDistance; local37 <= 0; local37++) {
 				local415 = Static167.anInt4069 + local37;
 				local183 = Static167.anInt4069 - local37;
 				if (local415 >= Static31.anInt987 || local183 < Static2.anInt15) {
-					for (local428 = -Static277.anInt5855; local428 <= 0; local428++) {
+					for (local428 = -Static277.tileVisibilityDistance; local428 <= 0; local428++) {
 						local434 = Static193.anInt4539 + local428;
 						local438 = Static193.anInt4539 - local428;
 						if (local415 >= Static31.anInt987) {

client/src/main/java/Static250.java

@@ -51,13 +51,13 @@ public final class Static250 {
 			for (@Pc(93) int local93 = 0; local93 < Static182.keyQueueSize; local93++) {
 				@Pc(104) int local104 = Static227.keyCodes[local93];
 				if (local104 == 98) {
-					Static72.anInt2031 = Static72.anInt2031 + 47 & 0xFFFFFFF0;
+					Static72.pitchTarget = Static72.pitchTarget + 47 & 0xFFFFFFF0;
 				} else if (local104 == 99) {
-					Static72.anInt2031 = Static72.anInt2031 - 17 & 0xFFFFFFF0;
+					Static72.pitchTarget = Static72.pitchTarget - 17 & 0xFFFFFFF0;
 				} else if (local104 == 96) {
-					Static57.anInt1747 = Static57.anInt1747 - 65 & 0xFFFFFF80;
+					Static57.yawTarget = Static57.yawTarget - 65 & 0xFFFFFF80;
 				} else if (local104 == 97) {
-					Static57.anInt1747 = Static57.anInt1747 + 191 & 0xFFFFFF80;
+					Static57.yawTarget = Static57.yawTarget + 191 & 0xFFFFFF80;
 				}
 			}
 		} else {
@@ -75,9 +75,9 @@ public final class Static250 {
 			} else {
 				Static38.anInt1203 /= 2;
 			}
-			Static72.anInt2031 += Static56.anInt1743 / 2;
+			Static72.pitchTarget += Static56.anInt1743 / 2;
-			Static57.anInt1747 += Static38.anInt1203 / 2;
+			Static57.yawTarget += Static38.anInt1203 / 2;
 		}
-		Static87.method1812();
+		Static87.clampCameraAngle();
 	}
 }

client/src/main/java/Static252.java

@@ -41,28 +41,28 @@ public final class Static252 {
 			Static243.anIntArray476[local33] = 1000000;
 			Static50.anIntArray134[local33] = 0;
 		}
-		if (Static227.anInt5096 != 1) {
+		if (Static227.cameraType != 1) {
-			local33 = Static207.method3685(Static55.level, Static138.anInt3439, Static134.anInt3302);
+			local33 = Static207.method3685(Static55.level, Static138.renderX, Static134.renderZ);
-			if (local33 - Static5.anInt40 < 800 && (Static12.aByteArrayArrayArray2[Static55.level][Static138.anInt3439 >> 7][Static134.anInt3302 >> 7] & 0x4) != 0) {
+			if (local33 - Static5.anInt40 < 800 && (Static12.tileSettings[Static55.level][Static138.renderX >> 7][Static134.renderZ >> 7] & 0x4) != 0) {
-				Static254.method4348(false, Static138.anInt3439 >> 7, Static134.anInt3302 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1);
+				Static254.method4348(false, Static138.renderX >> 7, Static134.renderZ >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 			}
 			return;
 		}
-		if ((Static12.aByteArrayArrayArray2[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) {
+		if ((Static12.tileSettings[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) {
 			Static254.method4348(false, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0);
 		}
-		if (Static240.anInt5333 >= 310) {
+		if (Static240.cameraPitch >= 310) {
 			return;
 		}
 		@Pc(135) int local135 = Static173.self.anInt3421 >> 7;
-		local40 = Static134.anInt3302 >> 7;
+		local40 = Static134.renderZ >> 7;
 		@Pc(146) int local146;
 		if (local40 < local135) {
 			local146 = local135 - local40;
 		} else {
 			local146 = local40 - local135;
 		}
-		local33 = Static138.anInt3439 >> 7;
+		local33 = Static138.renderX >> 7;
 		@Pc(162) int local162 = Static173.self.anInt3412 >> 7;
 		@Pc(174) int local174;
 		if (local162 > local33) {
@@ -81,7 +81,7 @@ public final class Static252 {
 				} else if (local40 > local135) {
 					local40--;
 				}
-				if ((Static12.aByteArrayArrayArray2[Static55.level][local33][local40] & 0x4) != 0) {
+				if ((Static12.tileSettings[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.level][local33][local40] & 0x4) != 0) {
+					if ((Static12.tileSettings[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.level][local33][local40] & 0x4) != 0) {
+			if ((Static12.tileSettings[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.level][local33][local40] & 0x4) != 0) {
+				if ((Static12.tileSettings[Static55.level][local33][local40] & 0x4) != 0) {
 					Static254.method4348(false, local33, local40, Static130.aClass3_Sub5ArrayArrayArray1, 1);
 					break;
 				}

client/src/main/java/Static253.java

@@ -45,9 +45,9 @@ public final class Static253 {
 		}
 		@Pc(59) int local59;
 		@Pc(57) int local57;
-		if (Static227.anInt5096 == 1) {
+		if (Static227.cameraType == 1) {
-			local57 = Static230.anInt5161 + Static57.anInt1747 & 0x7FF;
+			local57 = Static230.anInt5161 + Static57.yawTarget & 0x7FF;
-			local59 = Static72.anInt2031;
+			local59 = Static72.pitchTarget;
 			if (local59 < Static234.anInt5245 / 256) {
 				local59 = Static234.anInt5245 / 256;
 			}
@@ -57,44 +57,44 @@ public final class Static253 {
 			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;
+		local59 = Static138.renderX;
-		@Pc(121) int local121 = Static134.anInt3302;
+		@Pc(121) int local121 = Static134.renderZ;
-		@Pc(123) int local123 = Static240.anInt5333;
+		@Pc(123) int local123 = Static240.cameraPitch;
-		@Pc(125) int local125 = Static184.anInt4358;
+		@Pc(125) int local125 = Static184.cameraYaw;
 		@Pc(127) int local127;
 		@Pc(171) int local171;
 		for (local127 = 0; local127 < 5; local127++) {
 			if (Static176.aBooleanArray95[local127]) {
 				local171 = (int) ((double) -Static222.anIntArray437[local127] + (double) (Static222.anIntArray437[local127] * 2 + 1) * Math.random() + Math.sin((double) Static31.anIntArray76[local127] * ((double) Static202.anIntArray424[local127] / 100.0D)) * (double) Static276.anIntArray564[local127]);
 				if (local127 == 3) {
-					Static184.anInt4358 = local171 + Static184.anInt4358 & 0x7FF;
+					Static184.cameraYaw = local171 + Static184.cameraYaw & 0x7FF;
 				}
 				if (local127 == 4) {
-					Static240.anInt5333 += local171;
+					Static240.cameraPitch += local171;
-					if (Static240.anInt5333 < 128) {
+					if (Static240.cameraPitch < 128) {
-						Static240.anInt5333 = 128;
+						Static240.cameraPitch = 128;
 					}
-					if (Static240.anInt5333 > 383) {
+					if (Static240.cameraPitch > 383) {
-						Static240.anInt5333 = 383;
+						Static240.cameraPitch = 383;
 					}
 				}
 				if (local127 == 2) {
-					Static134.anInt3302 += local171;
+					Static134.renderZ += local171;
 				}
 				if (local127 == 1) {
 					Static5.anInt40 += local171;
 				}
 				if (local127 == 0) {
-					Static138.anInt3439 += local171;
+					Static138.renderX += local171;
 				}
 			}
 		}
 		Static252.method4302();
 		if (GlRenderer.enabled) {
 			Static46.method1187(arg2, arg4, arg2 + arg3, arg4 - -arg0);
-			@Pc(248) float local248 = (float) Static240.anInt5333 * 0.17578125F;
+			@Pc(248) float local248 = (float) Static240.cameraPitch * 0.17578125F;
-			@Pc(253) float local253 = (float) Static184.anInt4358 * 0.17578125F;
+			@Pc(253) float local253 = (float) Static184.cameraYaw * 0.17578125F;
-			if (Static227.anInt5096 == 3) {
+			if (Static227.cameraType == 3) {
 				local248 = Static146.aFloat15 * 360.0F / 6.2831855F;
 				local253 = Static84.aFloat10 * 360.0F / 6.2831855F;
 			}
@@ -122,16 +122,16 @@ public final class Static253 {
 			GlRenderer.method4173();
 			GlRenderer.setDepthTestEnabled(true);
 			GlRenderer.setFogEnabled(true);
-			if (Static244.anInt5370 == 10) {
+			if (Static244.gameState == 10) {
-				local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.brightness, Static138.anInt3439 >> 10);
+				local171 = Static103.method2235(Static178.anInt4247, Static134.renderZ >> 10, Static113.brightness, Static138.renderX >> 10);
 			} else {
 				local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.brightness, Static173.self.movementQueueX[0] >> 3);
 			}
-			Static120.method2394(Static83.anInt372, !Static11.aBoolean15);
+			Static120.method2394(Static83.loop, !Static11.aBoolean15);
 			GlRenderer.clearColorAndDepthBuffers(local171);
-			Static143.method2731(Static240.anInt5333, Static134.anInt3302, Static5.anInt40, Static138.anInt3439, Static184.anInt4358);
+			Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw);
-			GlRenderer.anInt5323 = Static83.anInt372;
+			GlRenderer.anInt5323 = Static83.loop;
-			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);
+			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, 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.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7);
+			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, 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);
@@ -149,11 +149,11 @@ public final class Static253 {
 		}
 		((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247);
 		Static115.method2310(arg3, arg4, arg0, arg2);
-		Static240.anInt5333 = local123;
+		Static240.cameraPitch = local123;
-		Static134.anInt3302 = local121;
+		Static134.renderZ = local121;
 		Static5.anInt40 = local57;
-		Static138.anInt3439 = local59;
+		Static138.renderX = local59;
-		Static184.anInt4358 = local125;
+		Static184.cameraYaw = local125;
 		if (Static19.aBoolean43 && Static107.js5NetQueue.method2328() == 0) {
 			Static19.aBoolean43 = false;
 		}
@@ -163,7 +163,7 @@ public final class Static253 {
 			} else {
 				Static129.method2495(arg2, arg4, arg3, arg0, 0);
 			}
-			Static114.method4636(false, LocalizedText.LOADING);
+			Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 		}
 		if (!arg1 && !Static19.aBoolean43 && !Static60.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) {
 			Static176.method3304(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751);
@@ -181,7 +181,7 @@ public final class Static253 {
 		if (local10 != null) {
 			return local10;
 		}
-		@Pc(24) byte[] local24 = Static84.aClass153_35.method4495(Static97.method1959(arg0), Static103.method2236(arg0));
+		@Pc(24) byte[] local24 = Static84.aClass153_35.getFile(Static97.method1959(arg0), Static103.method2236(arg0));
 		local10 = new EnumType();
 		if (local24 != null) {
 			local10.method3094(new Buffer(local24));

client/src/main/java/Static254.java

@@ -20,7 +20,7 @@ public final class Static254 {
 	public static final JagString aClass100_1061 = Static28.parse("null");
 
 	@OriginalMember(owner = "client!uj", name = "t", descriptor = "[I")
-	public static final int[] anIntArray487 = new int[1000];
+	public static final int[] intStack = new int[1000];
 
 	@OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
 	public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };
@@ -44,7 +44,7 @@ public final class Static254 {
 		@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF);
 		if (local14 == Static266.aByteArrayArrayArray15[Static55.level][arg1][arg2]) {
 			return false;
-		} else if ((Static12.aByteArrayArrayArray2[Static55.level][arg1][arg2] & 0x4) == 0) {
+		} else if ((Static12.tileSettings[Static55.level][arg1][arg2] & 0x4) == 0) {
 			return false;
 		} else {
 			@Pc(47) int local47 = 0;
@@ -62,13 +62,13 @@ public final class Static254 {
 				local47 = local47 + 1 & 0xFFF;
 				@Pc(130) boolean local130 = false;
 				@Pc(132) boolean local132 = false;
-				if ((Static12.aByteArrayArrayArray2[Static55.level][local108][local122] & 0x4) == 0) {
+				if ((Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0) {
 					local130 = true;
 				}
 				@Pc(150) int local150;
 				@Pc(191) int local191;
 				label238: for (local150 = Static55.level + 1; local150 <= 3; local150++) {
-					if ((Static12.aByteArrayArrayArray2[local150][local108][local122] & 0x8) == 0) {
+					if ((Static12.tileSettings[local150][local108][local122] & 0x8) == 0) {
 						@Pc(227) int local227;
 						@Pc(358) int local358;
 						if (local130 && arg3[local150][local108][local122] != null) {
@@ -122,8 +122,8 @@ public final class Static254 {
 					}
 				}
 				if (local132) {
-					if (Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
+					if (Static83.activeTileHeightMap[Static55.level + 1][local108][local122] > Static79.anIntArray205[arg4]) {
-						Static79.anIntArray205[arg4] = Static83.anIntArrayArrayArray4[Static55.level + 1][local108][local122];
+						Static79.anIntArray205[arg4] = Static83.activeTileHeightMap[Static55.level + 1][local108][local122];
 					}
 					local150 = local108 << 7;
 					if (local150 < Static149.anIntArray338[arg4]) {
@@ -147,7 +147,7 @@ public final class Static254 {
 					}
 					local122++;
 					if (local122 < 104) {
-						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) {
+						if (local108 - 1 >= 0 && local14 != Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 - 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = 0x52000000 | 0x120000 | local108 - 1;
 							Static84.anIntArray209[local69] = local122 | 0x130000;
 							Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
@@ -159,7 +159,7 @@ public final class Static254 {
 							local69 = local69 + 1 & 0xFFF;
 							Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14;
 						}
-						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) {
+						if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 - 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = 0x92000000 | 0x520000 | local108 + 1;
 							Static84.anIntArray209[local69] = local122 | 0x530000;
 							Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;
@@ -175,7 +175,7 @@ public final class Static254 {
 					}
 					local122--;
 					if (local122 >= 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) {
+						if (local108 - 1 >= 0 && Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 - 1][local122 + 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = local108 - 1 | 0xD20000 | 0x12000000;
 							Static84.anIntArray209[local69] = local122 | 0xD30000;
 							Static266.aByteArrayArrayArray15[Static55.level][local108 - 1][local122] = local14;
@@ -187,7 +187,7 @@ public final class Static254 {
 							local69 = local69 + 1 & 0xFFF;
 							Static266.aByteArrayArrayArray15[Static55.level][local108][local122] = local14;
 						}
-						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) {
+						if (local108 + 1 < 104 && Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] != local14 && (Static12.tileSettings[Static55.level][local108][local122] & 0x4) == 0 && (Static12.tileSettings[Static55.level][local108 + 1][local122 + 1] & 0x4) == 0) {
 							Static259.anIntArray514[local69] = local108 + 1 | 0xD2000000 | 0x920000;
 							Static84.anIntArray209[local69] = local122 | 0x930000;
 							Static266.aByteArrayArrayArray15[Static55.level][local108 + 1][local122] = local14;