chore: Reordered Client class methods, updated a few field names

src/main/java/jagex2/config/LocType.java

@@ -176,7 +176,7 @@ public LocType method562() {
 			int var4 = var3.field1762;
 			int var5 = var3.field1763;
 			int var6 = var3.field1764;
-			int var7 = Client.field510[var6 - var5];
+			int var7 = Client.VARBIT_MASKS[var6 - var5];
 			var2 = varProvider.varps[var4] >> var5 & var7;
 		} else if (this.field1635 != -1) {
 			var2 = varProvider.varps[this.field1635];
@@ -190,7 +190,7 @@ public void method563(OnDemand arg0) {
 			return;
 		}
 		for (int var3 = 0; var3 < this.field1617.length; var3++) {
-			arg0.method594(this.field1617[var3] & 0xFFFF, 0);
+			arg0.prefetch(this.field1617[var3] & 0xFFFF, 0);
 		}
 	}
 

src/main/java/jagex2/config/NpcType.java

@@ -273,7 +273,7 @@ public boolean method473() {
 			int var4 = var3.field1762;
 			int var5 = var3.field1763;
 			int var6 = var3.field1764;
-			int var7 = Client.field510[var6 - var5];
+			int var7 = Client.VARBIT_MASKS[var6 - var5];
 			var2 = varProvider.varps[var4] >> var5 & var7;
 		} else if (this.field1462 != -1) {
 			var2 = varProvider.varps[this.field1462];
@@ -364,7 +364,7 @@ public NpcType method476() {
 			int var4 = var3.field1762;
 			int var5 = var3.field1763;
 			int var6 = var3.field1764;
-			int var7 = Client.field510[var6 - var5];
+			int var7 = Client.VARBIT_MASKS[var6 - var5];
 			var2 = varProvider.varps[var4] >> var5 & var7;
 		} else if (this.field1462 != -1) {
 			var2 = varProvider.varps[this.field1462];

src/main/java/jagex2/dash3d/ClientLocAnim.java

@@ -58,7 +58,7 @@ public LocType method440() {
 			int var4 = var3.field1762;
 			int var5 = var3.field1763;
 			int var6 = var3.field1764;
-			int var7 = Client.field510[var6 - var5];
+			int var7 = Client.VARBIT_MASKS[var6 - var5];
 			var2 = varProvider.varps[var4] >> var5 & var7;
 		} else if (this.field1340 != -1) {
 			var2 = varProvider.varps[this.field1340];

src/main/java/jagex2/dash3d/Model.java

@@ -343,7 +343,7 @@ public static Model tryGet(int arg0) {
 		}
 		Metadata var1 = field1229[arg0];
 		if (var1 == null) {
-			field1230.method456(arg0);
+			field1230.requestModel(arg0);
 			return null;
 		} else {
 			return new Model(arg0, -478);
@@ -357,7 +357,7 @@ public static boolean method360(int arg0) {
 		}
 		Metadata var1 = field1229[arg0];
 		if (var1 == null) {
-			field1230.method456(arg0);
+			field1230.requestModel(arg0);
 			return false;
 		} else {
 			return true;

src/main/java/jagex2/dash3d/World3D.java

@@ -1198,7 +1198,7 @@ public void draw(int arg0, int arg1, int arg3, int arg4, int arg5, int arg6) {
 
 	@ObfuscatedName("KJCMXHNO.a(LRIEEXHOP;Z)V")
 	public void method314(Square arg0, boolean arg1) {
-		field1054.method3(arg0);
+		field1054.push(arg0);
 		while (true) {
 			Square var3;
 			int var4;
@@ -1219,7 +1219,7 @@ public void method314(Square arg0, boolean arg1) {
 									while (true) {
 										while (true) {
 											do {
-												var3 = (Square) field1054.method5();
+												var3 = (Square) field1054.pop();
 												if (var3 == null) {
 													return;
 												}
@@ -1397,25 +1397,25 @@ public void method314(Square arg0, boolean arg1) {
 												if (var4 < field1030 && (var35 & 0x4) != 0) {
 													Square var36 = var8[var4 + 1][var5];
 													if (var36 != null && var36.field1396) {
-														field1054.method3(var36);
+														field1054.push(var36);
 													}
 												}
 												if (var5 < field1031 && (var35 & 0x2) != 0) {
 													Square var37 = var8[var4][var5 + 1];
 													if (var37 != null && var37.field1396) {
-														field1054.method3(var37);
+														field1054.push(var37);
 													}
 												}
 												if (var4 > field1030 && (var35 & 0x1) != 0) {
 													Square var38 = var8[var4 - 1][var5];
 													if (var38 != null && var38.field1396) {
-														field1054.method3(var38);
+														field1054.push(var38);
 													}
 												}
 												if (var5 > field1031 && (var35 & 0x8) != 0) {
 													Square var39 = var8[var4][var5 - 1];
 													if (var39 != null && var39.field1396) {
-														field1054.method3(var39);
+														field1054.push(var39);
 													}
 												}
 											}
@@ -1522,9 +1522,9 @@ public void method314(Square arg0, boolean arg1) {
 													for (int var65 = var63.field84; var65 <= var63.field85; var65++) {
 														Square var66 = var8[var64][var65];
 														if (var66.field1398 != 0) {
-															field1054.method3(var66);
+															field1054.push(var66);
 														} else if ((var4 != var64 || var5 != var65) && var66.field1396) {
-															field1054.method3(var66);
+															field1054.push(var66);
 														}
 													}
 												}
@@ -1620,31 +1620,31 @@ public void method314(Square arg0, boolean arg1) {
 			if (var6 < this.field1014 - 1) {
 				Square var84 = this.field1018[var6 + 1][var4][var5];
 				if (var84 != null && var84.field1396) {
-					field1054.method3(var84);
+					field1054.push(var84);
 				}
 			}
 			if (var4 < field1030) {
 				Square var85 = var8[var4 + 1][var5];
 				if (var85 != null && var85.field1396) {
-					field1054.method3(var85);
+					field1054.push(var85);
 				}
 			}
 			if (var5 < field1031) {
 				Square var86 = var8[var4][var5 + 1];
 				if (var86 != null && var86.field1396) {
-					field1054.method3(var86);
+					field1054.push(var86);
 				}
 			}
 			if (var4 > field1030) {
 				Square var87 = var8[var4 - 1][var5];
 				if (var87 != null && var87.field1396) {
-					field1054.method3(var87);
+					field1054.push(var87);
 				}
 			}
 			if (var5 > field1031) {
 				Square var88 = var8[var4][var5 - 1];
 				if (var88 != null && var88.field1396) {
-					field1054.method3(var88);
+					field1054.push(var88);
 				}
 			}
 		}

src/main/java/jagex2/datastruct/DoublyLinkList.java

@@ -5,67 +5,68 @@
 public class DoublyLinkList {
 
 	@ObfuscatedName("CZYJUOKA.b")
-	public DoublyLinkable field631 = new DoublyLinkable();
+	public DoublyLinkable sentinel = new DoublyLinkable();
 
 	@ObfuscatedName("CZYJUOKA.c")
-	public DoublyLinkable field632;
+	public DoublyLinkable cursor;
 
 	public DoublyLinkList() {
-		this.field631.field633 = this.field631;
-		this.field631.field634 = this.field631;
+		this.sentinel.next2 = this.sentinel;
+		this.sentinel.prev2 = this.sentinel;
 	}
 
 	@ObfuscatedName("CZYJUOKA.a(LDPPNUUMQ;)V")
-	public void method180(DoublyLinkable arg0) {
-		if (arg0.field634 != null) {
-			arg0.method185();
+	public void push(DoublyLinkable node) {
+		if (node.prev2 != null) {
+			node.unlink2();
 		}
-		arg0.field634 = this.field631.field634;
-		arg0.field633 = this.field631;
-		arg0.field634.field633 = arg0;
-		arg0.field633.field634 = arg0;
+
+		node.prev2 = this.sentinel.prev2;
+		node.next2 = this.sentinel;
+		node.prev2.next2 = node;
+		node.next2.prev2 = node;
 	}
 
 	@ObfuscatedName("CZYJUOKA.a()LDPPNUUMQ;")
-	public DoublyLinkable method181() {
-		DoublyLinkable var1 = this.field631.field633;
-		if (this.field631 == var1) {
+	public DoublyLinkable pop() {
+		DoublyLinkable node = this.sentinel.next2;
+		if (this.sentinel == node) {
 			return null;
 		} else {
-			var1.method185();
-			return var1;
+			node.unlink2();
+			return node;
 		}
 	}
 
 	@ObfuscatedName("CZYJUOKA.b()LDPPNUUMQ;")
-	public DoublyLinkable method182() {
-		DoublyLinkable var1 = this.field631.field633;
-		if (this.field631 == var1) {
-			this.field632 = null;
+	public DoublyLinkable head() {
+		DoublyLinkable node = this.sentinel.next2;
+		if (this.sentinel == node) {
+			this.cursor = null;
 			return null;
 		} else {
-			this.field632 = var1.field633;
-			return var1;
+			this.cursor = node.next2;
+			return node;
 		}
 	}
 
 	@ObfuscatedName("CZYJUOKA.a(I)LDPPNUUMQ;")
-	public DoublyLinkable method183() {
-		DoublyLinkable var2 = this.field632;
-		if (this.field631 == var2) {
-			this.field632 = null;
+	public DoublyLinkable next() {
+		DoublyLinkable node = this.cursor;
+		if (this.sentinel == node) {
+			this.cursor = null;
 			return null;
 		}
-		this.field632 = var2.field633;
-		return var2;
+		this.cursor = node.next2;
+		return node;
 	}
 
 	@ObfuscatedName("CZYJUOKA.c()I")
-	public int method184() {
-		int var1 = 0;
-		for (DoublyLinkable var2 = this.field631.field633; var2 != this.field631; var2 = var2.field633) {
-			var1++;
+	public int size() {
+		int count = 0;
+		for (DoublyLinkable node = this.sentinel.next2; node != this.sentinel; node = node.next2) {
+			count++;
 		}
-		return var1;
+		return count;
 	}
 }

src/main/java/jagex2/datastruct/DoublyLinkable.java

@@ -5,18 +5,18 @@
 public class DoublyLinkable extends Linkable {
 
 	@ObfuscatedName("DPPNUUMQ.e")
-	public DoublyLinkable field633;
+	public DoublyLinkable next2;
 
 	@ObfuscatedName("DPPNUUMQ.f")
-	public DoublyLinkable field634;
+	public DoublyLinkable prev2;
 
 	@ObfuscatedName("DPPNUUMQ.b()V")
-	public void method185() {
-		if (this.field634 != null) {
-			this.field634.field633 = this.field633;
-			this.field633.field634 = this.field634;
-			this.field633 = null;
-			this.field634 = null;
+	public void unlink2() {
+		if (this.prev2 != null) {
+			this.prev2.next2 = this.next2;
+			this.next2.prev2 = this.prev2;
+			this.next2 = null;
+			this.prev2 = null;
 		}
 	}
 }

src/main/java/jagex2/datastruct/HashTable.java

@@ -5,42 +5,46 @@
 public class HashTable {
 
 	@ObfuscatedName("JLFXAIRK.c")
-	public int field899;
+	public int bucketCount;
 
 	@ObfuscatedName("JLFXAIRK.d")
-	public Linkable[] field900;
-
-	public HashTable(int arg1) {
-		this.field899 = arg1;
-		this.field900 = new Linkable[arg1];
-		for (int var3 = 0; var3 < arg1; var3++) {
-			Linkable var5 = this.field900[var3] = new Linkable();
-			var5.field1770 = var5;
-			var5.field1771 = var5;
+	public Linkable[] buckets;
+
+	public HashTable(int size) {
+		this.bucketCount = size;
+		this.buckets = new Linkable[size];
+
+		for (int i = 0; i < size; i++) {
+			Linkable node = this.buckets[i] = new Linkable();
+			node.next = node;
+			node.prev = node;
 		}
 	}
 
 	@ObfuscatedName("JLFXAIRK.a(J)LZUOIJLRD;")
-	public Linkable method259(long arg0) {
-		Linkable var3 = this.field900[(int) (arg0 & (long) (this.field899 - 1))];
-		for (Linkable var4 = var3.field1770; var4 != var3; var4 = var4.field1770) {
-			if (var4.field1769 == arg0) {
-				return var4;
+	public Linkable get(long key) {
+		Linkable sentinel = this.buckets[(int) (key & (long) (this.bucketCount - 1))];
+
+		for (Linkable node = sentinel.next; node != sentinel; node = node.next) {
+			if (node.key == key) {
+				return node;
 			}
 		}
+
 		return null;
 	}
 
 	@ObfuscatedName("JLFXAIRK.a(ILZUOIJLRD;J)V")
-	public void method260(Linkable arg1, long arg2) {
-		if (arg1.field1771 != null) {
-			arg1.unlink();
+	public void put(Linkable node, long key) {
+		if (node.prev != null) {
+			node.unlink();
 		}
-		Linkable var5 = this.field900[(int) (arg2 & (long) (this.field899 - 1))];
-		arg1.field1771 = var5.field1771;
-		arg1.field1770 = var5;
-		arg1.field1771.field1770 = arg1;
-		arg1.field1770.field1771 = arg1;
-		arg1.field1769 = arg2;
+
+		Linkable sentinel = this.buckets[(int) (key & (long) (this.bucketCount - 1))];
+		node.prev = sentinel.prev;
+		node.next = sentinel;
+		node.prev.next = node;
+		node.next.prev = node;
+		node.key = key;
 	}
 }