Renamed bunch of variables in all Type classes

client/src/main/java/AreaSound.java

@@ -82,7 +82,7 @@ public final class AreaSound extends Node {
 			if (local8 != local92) {
 				@Pc(100) NpcType local100 = this.npc.type;
 				this.sound = local92;
-				if (local100.anIntArray357 != null) {
+				if (local100.multiNpcs != null) {
 					local100 = local100.getMultiNpc();
 				}
 				if (local100 == null) {

client/src/main/java/Component.java

@@ -500,14 +500,14 @@ public final class Component {
 		if (this.anIntArray37 != null) {
 			return true;
 		}
-		@Pc(18) SoftwareIndexedSprite local18 = Static164.method3119(this.anInt477, Static23.aClass153_12);
+		@Pc(18) SoftwareIndexedSprite local18 = Static164.loadSoftwareIndexedSprite(this.anInt477, Static23.aClass153_12);
 		if (local18 == null) {
 			return false;
 		}
 		local18.method1396();
-		this.anIntArray37 = new int[local18.anInt4278];
+		this.anIntArray37 = new int[local18.height];
-		this.anIntArray45 = new int[local18.anInt4278];
+		this.anIntArray45 = new int[local18.height];
-		for (@Pc(37) int local37 = 0; local37 < local18.anInt4278; local37++) {
+		for (@Pc(37) int local37 = 0; local37 < local18.height; local37++) {
 			@Pc(47) int local47 = 0;
 			@Pc(50) int local50 = local18.width;
 			@Pc(52) int local52;
@@ -850,12 +850,12 @@ public final class Component {
 			if (local10 == 1) {
 				local61 = (Model) Static124.aClass99_17.get((long) ((local10 << 16) + local13));
 				if (local61 == null) {
-					@Pc(69) RawModel local69 = Static77.method1686(Static203.aClass153_85, local13);
+					@Pc(69) RawModel local69 = Static77.create(Static203.aClass153_85, local13);
 					if (local69 == null) {
 						Static211.aBoolean72 = true;
 						return null;
 					}
-					local61 = local69.method1679(64, 768, -50, -10, -50);
+					local61 = local69.createModel(64, 768, -50, -10, -50);
 					Static124.aClass99_17.put(local61, (long) (local13 + (local10 << 16)));
 				}
 				if (arg1 != null) {
@@ -863,7 +863,7 @@ public final class Component {
 				}
 				return local61;
 			} else if (local10 == 2) {
-				local61 = Static214.method4363(local13).method2943(arg1, arg3, arg0, arg2);
+				local61 = Static214.get(local13).getHeadModel(arg1, arg3, arg0, arg2);
 				if (local61 == null) {
 					Static211.aBoolean72 = true;
 					return null;
@@ -882,8 +882,8 @@ public final class Component {
 					return local61;
 				}
 			} else if (local10 == 4) {
-				@Pc(164) ObjType local164 = Static71.method1439(local13);
+				@Pc(164) ObjType local164 = Static71.get(local13);
-				@Pc(173) Model local173 = local164.method1824(arg0, arg3, arg1, 10, arg2);
+				@Pc(173) Model local173 = local164.getModel(arg0, arg3, arg1, 10, arg2);
 				if (local173 == null) {
 					Static211.aBoolean72 = true;
 					return null;
@@ -891,7 +891,7 @@ public final class Component {
 					return local173;
 				}
 			} else if (local10 == 6) {
-				local61 = Static214.method4363(local13).method2937(null, 0, 0, arg0, arg3, arg2, null, 0, arg1);
+				local61 = Static214.get(local13).getBodyModel(null, 0, 0, arg0, arg3, arg2, null, 0, arg1);
 				if (local61 == null) {
 					Static211.aBoolean72 = true;
 					return null;

client/src/main/java/Font.java

@@ -106,7 +106,7 @@ public abstract class Font extends SecondaryNode {
 								try {
 									local120 = local42.substring(4).parseInt();
 									@Pc(125) IndexedSprite local125 = this.nameIcons[local120];
-									@Pc(136) int local136 = this.nameIconHeights == null ? local125.anInt4276 : this.nameIconHeights[local120];
+									@Pc(136) int local136 = this.nameIconHeights == null ? local125.innerHeight : this.nameIconHeights[local120];
 									if (Static218.alphaOverride == 256) {
 										local125.renderTransparent(arg1, local4 + this.lineHeight - local136);
 									} else {
@@ -787,7 +787,7 @@ public abstract class Font extends SecondaryNode {
 									local10++;
 									local141 = local44.substring(4).parseInt();
 									@Pc(146) IndexedSprite local146 = this.nameIcons[local141];
-									@Pc(157) int local157 = this.nameIconHeights == null ? local146.anInt4276 : this.nameIconHeights[local141];
+									@Pc(157) int local157 = this.nameIconHeights == null ? local146.innerHeight : this.nameIconHeights[local141];
 									if (Static218.alphaOverride == 256) {
 										local146.renderTransparent(arg1 + local121, local4 + this.lineHeight - local157 + local130);
 									} else {

client/src/main/java/GlIndexedSprite.java

@@ -32,11 +32,11 @@ public final class GlIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!oh", name = "<init>", descriptor = "(IIIIII[B[I)V")
 	public GlIndexedSprite(@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) byte[] arg6, @OriginalArg(7) int[] arg7) {
 		this.innerWidth = arg0;
-		this.anInt4276 = arg1;
+		this.innerHeight = arg1;
 		this.anInt4280 = arg2;
 		this.anInt4273 = arg3;
 		this.width = arg4;
-		this.anInt4278 = arg5;
+		this.height = arg5;
 		this.method3337(arg6, arg7);
 		this.method3339();
 	}
@@ -44,11 +44,11 @@ public final class GlIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!oh", name = "a", descriptor = "([B[I)V")
 	private void method3337(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1) {
 		this.anInt4287 = Static165.clp2(this.width);
-		this.anInt4286 = Static165.clp2(this.anInt4278);
+		this.anInt4286 = Static165.clp2(this.height);
 		@Pc(20) byte[] local20 = new byte[this.anInt4287 * this.anInt4286 * 4];
 		@Pc(22) int local22 = 0;
 		@Pc(24) int local24 = 0;
-		for (@Pc(26) int local26 = 0; local26 < this.anInt4278; local26++) {
+		for (@Pc(26) int local26 = 0; local26 < this.height; local26++) {
 			for (@Pc(32) int local32 = 0; local32 < this.width; local32++) {
 				@Pc(41) byte local41 = arg0[local24++];
 				if (local41 == 0) {
@@ -134,7 +134,7 @@ public final class GlIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!oh", name = "a", descriptor = "()V")
 	private void method3339() {
 		@Pc(7) float local7 = (float) this.width / (float) this.anInt4287;
-		@Pc(15) float local15 = (float) this.anInt4278 / (float) this.anInt4286;
+		@Pc(15) float local15 = (float) this.height / (float) this.anInt4286;
 		@Pc(17) GL2 local17 = GlRenderer.gl;
 		if (this.anInt4282 == -1) {
 			this.anInt4282 = local17.glGenLists(1);
@@ -147,9 +147,9 @@ public final class GlIndexedSprite extends IndexedSprite {
 		local17.glTexCoord2f(0.0F, 0.0F);
 		local17.glVertex2f(0.0F, 0.0F);
 		local17.glTexCoord2f(0.0F, local15);
-		local17.glVertex2f(0.0F, (float) -this.anInt4278);
+		local17.glVertex2f(0.0F, (float) -this.height);
 		local17.glTexCoord2f(local7, local15);
-		local17.glVertex2f((float) this.width, (float) -this.anInt4278);
+		local17.glVertex2f((float) this.width, (float) -this.height);
 		local17.glEnd();
 		local17.glEndList();
 	}

client/src/main/java/GlModel.java

@@ -1646,7 +1646,7 @@ public final class GlModel extends Model {
 
 	@OriginalMember(owner = "client!td", name = "b", descriptor = "(III)V")
 	@Override
-	public final void method4559(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final void resize(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		for (@Pc(1) int local1 = 0; local1 < this.anInt5295; local1++) {
 			this.anIntArray461[local1] = this.anIntArray461[local1] * arg0 >> 7;
 			this.anIntArray465[local1] = this.anIntArray465[local1] * arg1 >> 7;
@@ -3194,7 +3194,7 @@ public final class GlModel extends Model {
 		} else {
 			local151 = arg0;
 			arg0.innerWidth = arg0.width = local134;
-			arg0.anInt4276 = arg0.anInt4278 = local140;
+			arg0.innerHeight = arg0.height = local140;
 			arg0.method1392();
 		}
 		local151.anInt4280 = local26;

client/src/main/java/IdkType.java

@@ -7,61 +7,61 @@ import org.openrs2.deob.annotation.Pc;
 public final class IdkType {
 
 	@OriginalMember(owner = "client!dm", name = "b", descriptor = "[S")
-	private short[] aShortArray11;
+	private short[] recolorDestination;
 
 	@OriginalMember(owner = "client!dm", name = "i", descriptor = "[S")
-	private short[] aShortArray12;
+	private short[] recolorSource;
 
 	@OriginalMember(owner = "client!dm", name = "s", descriptor = "[S")
-	private short[] aShortArray13;
+	private short[] retextureDestination;
 
 	@OriginalMember(owner = "client!dm", name = "t", descriptor = "[S")
-	private short[] aShortArray14;
+	private short[] retextureSource;
 
 	@OriginalMember(owner = "client!dm", name = "w", descriptor = "[I")
-	private int[] anIntArray112;
+	private int[] bodyModels;
 
 	@OriginalMember(owner = "client!dm", name = "x", descriptor = "[I")
-	private final int[] anIntArray113 = new int[] { -1, -1, -1, -1, -1 };
+	private final int[] headModels = new int[] { -1, -1, -1, -1, -1 };
 
 	@OriginalMember(owner = "client!dm", name = "k", descriptor = "I")
-	public int anInt1457 = -1;
+	public int feature = -1;
 
 	@OriginalMember(owner = "client!dm", name = "A", descriptor = "Z")
 	public boolean aBoolean85 = false;
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(Z)Lclient!gb;")
-	public final RawModel method1198() {
+	public final RawModel getHeadModel() {
 		@Pc(13) int local13 = 0;
 		@Pc(16) RawModel[] local16 = new RawModel[5];
 		for (@Pc(18) int local18 = 0; local18 < 5; local18++) {
-			if (this.anIntArray113[local18] != -1) {
+			if (this.headModels[local18] != -1) {
-				local16[local13++] = Static77.method1686(Static14.aClass153_8, this.anIntArray113[local18]);
+				local16[local13++] = Static77.create(Static14.modelsArchive, this.headModels[local18]);
 			}
 		}
 		@Pc(52) RawModel local52 = new RawModel(local16, local13);
 		@Pc(58) int local58;
-		if (this.aShortArray12 != null) {
+		if (this.recolorSource != null) {
-			for (local58 = 0; local58 < this.aShortArray12.length; local58++) {
+			for (local58 = 0; local58 < this.recolorSource.length; local58++) {
-				local52.method1687(this.aShortArray12[local58], this.aShortArray11[local58]);
+				local52.recolor(this.recolorSource[local58], this.recolorDestination[local58]);
 			}
 		}
-		if (this.aShortArray14 != null) {
+		if (this.retextureSource != null) {
-			for (local58 = 0; local58 < this.aShortArray14.length; local58++) {
+			for (local58 = 0; local58 < this.retextureSource.length; local58++) {
-				local52.method1669(this.aShortArray14[local58], this.aShortArray13[local58]);
+				local52.retexture(this.retextureSource[local58], this.retextureDestination[local58]);
 			}
 		}
 		return local52;
 	}
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(I)Z")
-	public final boolean method1199() {
+	public final boolean isBodyModelReady() {
-		if (this.anIntArray112 == null) {
+		if (this.bodyModels == null) {
 			return true;
 		}
 		@Pc(13) boolean local13 = true;
-		for (@Pc(22) int local22 = 0; local22 < this.anIntArray112.length; local22++) {
+		for (@Pc(22) int local22 = 0; local22 < this.bodyModels.length; local22++) {
-			if (!Static14.aClass153_8.method4491(0, this.anIntArray112[local22])) {
+			if (!Static14.modelsArchive.isFileReady(0, this.bodyModels[local22])) {
 				local13 = false;
 			}
 		}
@@ -69,50 +69,50 @@ public final class IdkType {
 	}
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(BLclient!wa;I)V")
-	private void method1203(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
+	private void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 1) {
-			this.anInt1457 = arg0.g1();
+			this.feature = arg0.g1();
 			return;
 		}
 		@Pc(22) int local22;
 		@Pc(28) int local28;
 		if (arg1 == 2) {
 			local22 = arg0.g1();
-			this.anIntArray112 = new int[local22];
+			this.bodyModels = new int[local22];
 			for (local28 = 0; local28 < local22; local28++) {
-				this.anIntArray112[local28] = arg0.g2();
+				this.bodyModels[local28] = arg0.g2();
 			}
 		} else if (arg1 == 3) {
 			this.aBoolean85 = true;
 		} else if (arg1 == 40) {
 			local22 = arg0.g1();
-			this.aShortArray11 = new short[local22];
+			this.recolorDestination = new short[local22];
-			this.aShortArray12 = new short[local22];
+			this.recolorSource = new short[local22];
 			for (local28 = 0; local28 < local22; local28++) {
-				this.aShortArray12[local28] = (short) arg0.g2();
+				this.recolorSource[local28] = (short) arg0.g2();
-				this.aShortArray11[local28] = (short) arg0.g2();
+				this.recolorDestination[local28] = (short) arg0.g2();
 			}
 		} else if (arg1 == 41) {
 			local22 = arg0.g1();
-			this.aShortArray14 = new short[local22];
+			this.retextureSource = new short[local22];
-			this.aShortArray13 = new short[local22];
+			this.retextureDestination = new short[local22];
 			for (local28 = 0; local28 < local22; local28++) {
-				this.aShortArray14[local28] = (short) arg0.g2();
+				this.retextureSource[local28] = (short) arg0.g2();
-				this.aShortArray13[local28] = (short) arg0.g2();
+				this.retextureDestination[local28] = (short) arg0.g2();
 			}
 		} else if (arg1 >= 60 && arg1 < 70) {
-			this.anIntArray113[arg1 - 60] = arg0.g2();
+			this.headModels[arg1 - 60] = arg0.g2();
 		}
 	}
 
 	@OriginalMember(owner = "client!dm", name = "b", descriptor = "(B)Lclient!gb;")
-	public final RawModel method1204() {
+	public final RawModel getBodyModel() {
-		if (this.anIntArray112 == null) {
+		if (this.bodyModels == null) {
 			return null;
 		}
-		@Pc(16) RawModel[] local16 = new RawModel[this.anIntArray112.length];
+		@Pc(16) RawModel[] local16 = new RawModel[this.bodyModels.length];
-		for (@Pc(18) int local18 = 0; local18 < this.anIntArray112.length; local18++) {
+		for (@Pc(18) int local18 = 0; local18 < this.bodyModels.length; local18++) {
-			local16[local18] = Static77.method1686(Static14.aClass153_8, this.anIntArray112[local18]);
+			local16[local18] = Static77.create(Static14.modelsArchive, this.bodyModels[local18]);
 		}
 		@Pc(56) RawModel local56;
 		if (local16.length == 1) {
@@ -121,24 +121,24 @@ public final class IdkType {
 			local56 = new RawModel(local16, local16.length);
 		}
 		@Pc(70) int local70;
-		if (this.aShortArray12 != null) {
+		if (this.recolorSource != null) {
-			for (local70 = 0; local70 < this.aShortArray12.length; local70++) {
+			for (local70 = 0; local70 < this.recolorSource.length; local70++) {
-				local56.method1687(this.aShortArray12[local70], this.aShortArray11[local70]);
+				local56.recolor(this.recolorSource[local70], this.recolorDestination[local70]);
 			}
 		}
-		if (this.aShortArray14 != null) {
+		if (this.retextureSource != null) {
-			for (local70 = 0; local70 < this.aShortArray14.length; local70++) {
+			for (local70 = 0; local70 < this.retextureSource.length; local70++) {
-				local56.method1669(this.aShortArray14[local70], this.aShortArray13[local70]);
+				local56.retexture(this.retextureSource[local70], this.retextureDestination[local70]);
 			}
 		}
 		return local56;
 	}
 
 	@OriginalMember(owner = "client!dm", name = "c", descriptor = "(I)Z")
-	public final boolean method1205() {
+	public final boolean isHeadModelReady() {
 		@Pc(3) boolean local3 = true;
 		for (@Pc(12) int local12 = 0; local12 < 5; local12++) {
-			if (this.anIntArray113[local12] != -1 && !Static14.aClass153_8.method4491(0, this.anIntArray113[local12])) {
+			if (this.headModels[local12] != -1 && !Static14.modelsArchive.isFileReady(0, this.headModels[local12])) {
 				local3 = false;
 			}
 		}
@@ -146,13 +146,13 @@ public final class IdkType {
 	}
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method1209(@OriginalArg(1) Buffer arg0) {
+	public final void decode(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(13) int local13 = arg0.g1();
 			if (local13 == 0) {
 				return;
 			}
-			this.method1203(arg0, local13);
+			this.decode(arg0, local13);
 		}
 	}
 }

client/src/main/java/IndexedSprite.java

@@ -12,10 +12,10 @@ public abstract class IndexedSprite {
 	public int anInt4273;
 
 	@OriginalMember(owner = "client!ok", name = "i", descriptor = "I")
-	public int anInt4276;
+	public int innerHeight;
 
 	@OriginalMember(owner = "client!ok", name = "k", descriptor = "I")
-	public int anInt4278;
+	public int height;
 
 	@OriginalMember(owner = "client!ok", name = "l", descriptor = "I")
 	public int innerWidth;

client/src/main/java/JagString.java

@@ -91,7 +91,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(ILclient!na;)Z")
-	public final boolean method3111(@OriginalArg(1) JagString arg0) {
+	public final boolean equalsIgnoreCase(@OriginalArg(1) JagString arg0) {
 		if (arg0 == null) {
 			return false;
 		} else if (this.length == arg0.length) {

client/src/main/java/Js5.java

@@ -166,7 +166,7 @@ public final class Js5 {
 		@Pc(30) int local30 = this.aClass70_2.aClass76_1.method2405(local17.method3154());
 		if (this.method4492(local30)) {
 			@Pc(49) int local49 = this.aClass70_2.aClass76Array1[local30].method2405(local21.method3154());
-			return this.method4491(local49, local30);
+			return this.isFileReady(local49, local30);
 		} else {
 			return false;
 		}
@@ -216,7 +216,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BII)Z")
-	public final boolean method4491(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+	public final boolean isFileReady(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		if (!this.method4501(arg1, arg0)) {
 			return false;
 		} else if (this.anObjectArrayArray1[arg1] != null && this.anObjectArrayArray1[arg1][arg0] != null) {
@@ -485,11 +485,11 @@ public final class Js5 {
 		if (!this.method4484()) {
 			return false;
 		} else if (this.aClass70_2.anIntArray270.length == 1) {
-			return this.method4491(arg0, 0);
+			return this.isFileReady(arg0, 0);
 		} else if (!this.method4492(arg0)) {
 			return false;
 		} else if (this.aClass70_2.anIntArray270[arg0] == 1) {
-			return this.method4491(0, arg0);
+			return this.isFileReady(0, arg0);
 		} else {
 			throw new RuntimeException();
 		}

client/src/main/java/Js5QuickChatCommandDecoder.java

@@ -13,8 +13,8 @@ public final class Js5QuickChatCommandDecoder implements QuickChatCommandDecoder
 			@Pc(12) EnumType local12 = Static253.method4330(arg1[0]);
 			return local12.getString((int) arg2);
 		} else if (arg0 == 1 || arg0 == 10) {
-			@Pc(31) ObjType local31 = Static71.method1439((int) arg2);
+			@Pc(31) ObjType local31 = Static71.get((int) arg2);
-			return local31.aClass100_495;
+			return local31.name;
 		} else if (arg0 == 6 || arg0 == 7 || arg0 == 11) {
 			return Static253.method4330(arg1[0]).getString((int) arg2);
 		} else {

client/src/main/java/Loc.java

@@ -82,8 +82,8 @@ public final class Loc extends Entity {
 			if (arg8 instanceof Loc) {
 				((Loc) arg8).method1046();
 			} else {
-				local67 = Static271.method4601(this.anInt1299);
+				local67 = Static271.get(this.anInt1299);
-				if (local67.anIntArray380 != null) {
+				if (local67.multiLocs != null) {
 					local67 = local67.getMultiLoc();
 				}
 				if (local67 != null) {
@@ -92,9 +92,9 @@ public final class Loc extends Entity {
 			}
 		}
 		if (arg6 != -1) {
-			this.aClass144_2 = Static36.method941(arg6);
+			this.aClass144_2 = Static36.get(arg6);
 			this.anInt1297 = 0;
-			if (this.aClass144_2.anIntArray473.length <= 1) {
+			if (this.aClass144_2.frames.length <= 1) {
 				this.anInt1304 = 0;
 			} else {
 				this.anInt1304 = 1;
@@ -112,11 +112,11 @@ public final class Loc extends Entity {
 				}
 			}
 			if (arg7 && this.aClass144_2.anInt5362 != -1) {
-				this.anInt1297 = (int) (Math.random() * (double) this.aClass144_2.anIntArray473.length);
+				this.anInt1297 = (int) (Math.random() * (double) this.aClass144_2.frames.length);
 				this.anInt1304 = this.anInt1297 + 1;
-				if (this.anInt1304 >= this.aClass144_2.anIntArray473.length) {
+				if (this.anInt1304 >= this.aClass144_2.frames.length) {
 					this.anInt1304 -= this.aClass144_2.anInt5362;
-					if (this.anInt1304 < 0 || this.anInt1304 >= this.aClass144_2.anIntArray473.length) {
+					if (this.anInt1304 < 0 || this.anInt1304 >= this.aClass144_2.frames.length) {
 						this.anInt1304 = -1;
 					}
 				}
@@ -128,8 +128,8 @@ public final class Loc extends Entity {
 			this.method1048(true);
 		}
 		if (arg8 == null) {
-			local67 = Static271.method4601(this.anInt1299);
+			local67 = Static271.get(this.anInt1299);
-			if (local67.anIntArray380 != null) {
+			if (local67.multiLocs != null) {
 				this.aBoolean80 = true;
 			}
 		}
@@ -176,22 +176,22 @@ public final class Loc extends Entity {
 		}
 		@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;
+			@Pc(29) int local29 = this.aClass144_2.frames.length - this.aClass144_2.anInt5362;
 			while (this.anInt1297 < local29 && this.aClass144_2.anIntArray474[this.anInt1297] < local10) {
 				local10 -= this.aClass144_2.anIntArray474[this.anInt1297];
 				this.anInt1297++;
 			}
 			if (this.anInt1297 >= local29) {
 				@Pc(77) int local77 = 0;
-				for (@Pc(79) int local79 = local29; local79 < this.aClass144_2.anIntArray473.length; local79++) {
+				for (@Pc(79) int local79 = local29; local79 < this.aClass144_2.frames.length; local79++) {
 					local77 += this.aClass144_2.anIntArray474[local79];
 				}
 				local10 %= local77;
 			}
 			this.anInt1304 = this.anInt1297 + 1;
-			if (this.anInt1304 >= this.aClass144_2.anIntArray473.length) {
+			if (this.anInt1304 >= this.aClass144_2.frames.length) {
 				this.anInt1304 -= this.aClass144_2.anInt5362;
-				if (this.anInt1304 < 0 || this.aClass144_2.anIntArray473.length <= this.anInt1304) {
+				if (this.anInt1304 < 0 || this.aClass144_2.frames.length <= this.anInt1304) {
 					this.anInt1304 = -1;
 				}
 			}
@@ -200,17 +200,17 @@ public final class Loc extends Entity {
 			Static152.method2836(arg0, this.aClass144_2, arg1, false, this.anInt1297);
 			local10 -= this.aClass144_2.anIntArray474[this.anInt1297];
 			this.anInt1297++;
-			if (this.aClass144_2.anIntArray473.length <= this.anInt1297) {
+			if (this.aClass144_2.frames.length <= this.anInt1297) {
 				this.anInt1297 -= this.aClass144_2.anInt5362;
-				if (this.anInt1297 < 0 || this.aClass144_2.anIntArray473.length <= this.anInt1297) {
+				if (this.anInt1297 < 0 || this.aClass144_2.frames.length <= this.anInt1297) {
 					this.aClass144_2 = null;
 					break;
 				}
 			}
 			this.anInt1304 = this.anInt1297 + 1;
-			if (this.aClass144_2.anIntArray473.length <= this.anInt1304) {
+			if (this.aClass144_2.frames.length <= this.anInt1304) {
 				this.anInt1304 -= this.aClass144_2.anInt5362;
-				if (this.anInt1304 < 0 || this.anInt1304 >= this.aClass144_2.anIntArray473.length) {
+				if (this.anInt1304 < 0 || this.anInt1304 >= this.aClass144_2.frames.length) {
 					this.anInt1304 = -1;
 				}
 			}
@@ -222,9 +222,9 @@ public final class Loc extends Entity {
 	@OriginalMember(owner = "client!dc", name = "a", descriptor = "(ZI)Lclient!th;")
 	private Entity method1048(@OriginalArg(0) boolean arg0) {
 		@Pc(12) boolean local12 = Static107.surfaceTileHeightMap != Static83.activeTileHeightMap;
-		@Pc(19) LocType local19 = Static271.method4601(this.anInt1299);
+		@Pc(19) LocType local19 = Static271.get(this.anInt1299);
 		@Pc(22) int local22 = local19.anInt4430;
-		if (local19.anIntArray380 != null) {
+		if (local19.multiLocs != null) {
 			local19 = local19.getMultiLoc();
 		}
 		if (local19 == null) {
@@ -242,11 +242,11 @@ public final class Loc extends Entity {
 			if (local69 == -1) {
 				this.aClass144_2 = null;
 			} else {
-				this.aClass144_2 = Static36.method941(local69);
+				this.aClass144_2 = Static36.get(local69);
 			}
 			if (this.aClass144_2 != null) {
 				if (local19.aBoolean209 && this.aClass144_2.anInt5362 != -1) {
-					this.anInt1297 = (int) (Math.random() * (double) this.aClass144_2.anIntArray473.length);
+					this.anInt1297 = (int) (Math.random() * (double) this.aClass144_2.frames.length);
 					this.anInt1320 -= (int) (Math.random() * (double) this.aClass144_2.anIntArray474[this.anInt1297]);
 				} else {
 					this.anInt1297 = 0;
@@ -258,11 +258,11 @@ public final class Loc extends Entity {
 		@Pc(160) int local160;
 		@Pc(157) int local157;
 		if (local69 == 1 || local69 == 3) {
-			local157 = local19.anInt4397;
+			local157 = local19.width;
-			local160 = local19.anInt4403;
+			local160 = local19.length;
 		} else {
-			local160 = local19.anInt4397;
+			local160 = local19.width;
-			local157 = local19.anInt4403;
+			local157 = local19.length;
 		}
 		@Pc(178) int local178 = this.anInt1308 + (local160 + 1 >> 1);
 		@Pc(185) int local185 = (local160 >> 1) + this.anInt1308;

client/src/main/java/LocType.java

@@ -7,31 +7,31 @@ import org.openrs2.deob.annotation.Pc;
 public final class LocType {
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "[S")
-	private short[] aShortArray60;
+	private short[] retextureSource;
 
 	@OriginalMember(owner = "client!pb", name = "b", descriptor = "[S")
-	private short[] aShortArray61;
+	private short[] recolorSource;
 
 	@OriginalMember(owner = "client!pb", name = "n", descriptor = "[I")
-	private int[] anIntArray378;
+	private int[] shapes;
 
 	@OriginalMember(owner = "client!pb", name = "v", descriptor = "[S")
-	private short[] aShortArray62;
+	private short[] retextureDestination;
 
 	@OriginalMember(owner = "client!pb", name = "B", descriptor = "Lclient!sc;")
-	private HashTable aClass133_19;
+	private HashTable params;
 
 	@OriginalMember(owner = "client!pb", name = "H", descriptor = "[S")
-	private short[] aShortArray63;
+	private short[] recolorDestination;
 
 	@OriginalMember(owner = "client!pb", name = "P", descriptor = "[B")
 	private byte[] aByteArray63;
 
 	@OriginalMember(owner = "client!pb", name = "X", descriptor = "[I")
-	private int[] anIntArray379;
+	private int[] models;
 
 	@OriginalMember(owner = "client!pb", name = "db", descriptor = "[I")
-	public int[] anIntArray380;
+	public int[] multiLocs;
 
 	@OriginalMember(owner = "client!pb", name = "hb", descriptor = "I")
 	public int anInt4426;
@@ -40,13 +40,13 @@ public final class LocType {
 	public int[] anIntArray381;
 
 	@OriginalMember(owner = "client!pb", name = "e", descriptor = "I")
-	public int anInt4397 = 1;
+	public int width = 1;
 
 	@OriginalMember(owner = "client!pb", name = "i", descriptor = "Z")
 	public boolean aBoolean206 = false;
 
 	@OriginalMember(owner = "client!pb", name = "l", descriptor = "I")
-	public int anInt4403 = 1;
+	public int length = 1;
 
 	@OriginalMember(owner = "client!pb", name = "C", descriptor = "Z")
 	public boolean aBoolean211 = false;
@@ -55,31 +55,31 @@ public final class LocType {
 	private int anInt4407 = 0;
 
 	@OriginalMember(owner = "client!pb", name = "E", descriptor = "Lclient!na;")
-	public JagString aClass100_830 = Static81.aClass100_475;
+	public JagString name = Static81.aClass100_475;
 
 	@OriginalMember(owner = "client!pb", name = "D", descriptor = "Z")
 	public boolean aBoolean212 = true;
 
 	@OriginalMember(owner = "client!pb", name = "t", descriptor = "I")
-	public int anInt4406 = -1;
+	public int cursor1Op = -1;
 
 	@OriginalMember(owner = "client!pb", name = "R", descriptor = "I")
 	public int anInt4414 = 0;
 
 	@OriginalMember(owner = "client!pb", name = "S", descriptor = "I")
-	public int anInt4415 = -1;
+	public int mapSceneId = -1;
 
 	@OriginalMember(owner = "client!pb", name = "G", descriptor = "B")
 	private byte aByte15 = 0;
 
 	@OriginalMember(owner = "client!pb", name = "r", descriptor = "Z")
-	public boolean aBoolean208 = false;
+	public boolean members = false;
 
 	@OriginalMember(owner = "client!pb", name = "T", descriptor = "I")
-	public int anInt4416 = -1;
+	public int cursor1 = -1;
 
 	@OriginalMember(owner = "client!pb", name = "w", descriptor = "I")
-	private int anInt4408 = 0;
+	private int translateX = 0;
 
 	@OriginalMember(owner = "client!pb", name = "W", descriptor = "I")
 	public int anInt4419 = 0;
@@ -91,25 +91,25 @@ public final class LocType {
 	public boolean aBoolean214 = false;
 
 	@OriginalMember(owner = "client!pb", name = "Y", descriptor = "I")
-	public int anInt4420 = -1;
+	public int cursor2Op = -1;
 
 	@OriginalMember(owner = "client!pb", name = "A", descriptor = "S")
 	private short aShort26 = -1;
 
 	@OriginalMember(owner = "client!pb", name = "g", descriptor = "I")
-	private int anInt4399 = 128;
+	private int resizeZ = 128;
 
 	@OriginalMember(owner = "client!pb", name = "z", descriptor = "[Lclient!na;")
-	public JagString[] aClass100Array130 = new JagString[5];
+	public JagString[] ops = new JagString[5];
 
 	@OriginalMember(owner = "client!pb", name = "d", descriptor = "I")
-	private int anInt4396 = 128;
+	private int resizeX = 128;
 
 	@OriginalMember(owner = "client!pb", name = "s", descriptor = "Z")
 	public boolean aBoolean209 = true;
 
 	@OriginalMember(owner = "client!pb", name = "o", descriptor = "I")
-	private int anInt4404 = 128;
+	private int resizeY = 128;
 
 	@OriginalMember(owner = "client!pb", name = "y", descriptor = "Z")
 	public boolean aBoolean210 = false;
@@ -124,31 +124,31 @@ public final class LocType {
 	public boolean aBoolean215 = true;
 
 	@OriginalMember(owner = "client!pb", name = "nb", descriptor = "I")
-	private int anInt4431 = -1;
+	private int multiLocVarp = -1;
 
 	@OriginalMember(owner = "client!pb", name = "bb", descriptor = "I")
-	public int anInt4423 = -1;
+	public int cursor2 = -1;
 
 	@OriginalMember(owner = "client!pb", name = "pb", descriptor = "I")
-	public int anInt4433 = 0;
+	public int blockedSides = 0;
 
 	@OriginalMember(owner = "client!pb", name = "m", descriptor = "Z")
 	public boolean aBoolean207 = true;
 
 	@OriginalMember(owner = "client!pb", name = "qb", descriptor = "I")
-	private int anInt4434 = 0;
+	private int translateZ = 0;
 
 	@OriginalMember(owner = "client!pb", name = "c", descriptor = "I")
-	public int anInt4395 = 0;
+	public int mapSceneAngleOffset = 0;
 
 	@OriginalMember(owner = "client!pb", name = "jb", descriptor = "I")
-	public int anInt4428 = 16;
+	public int wallDecorOffsetScale = 16;
 
 	@OriginalMember(owner = "client!pb", name = "tb", descriptor = "Z")
-	public boolean aBoolean218 = false;
+	public boolean mapSceneRotated = false;
 
 	@OriginalMember(owner = "client!pb", name = "N", descriptor = "I")
-	private int anInt4411 = 0;
+	private int translateY = 0;
 
 	@OriginalMember(owner = "client!pb", name = "k", descriptor = "I")
 	public int soundRadius = 0;
@@ -172,7 +172,7 @@ public final class LocType {
 	private boolean aBoolean217 = false;
 
 	@OriginalMember(owner = "client!pb", name = "gb", descriptor = "I")
-	private int anInt4425 = -1;
+	private int multiLocVarbit = -1;
 
 	@OriginalMember(owner = "client!pb", name = "yb", descriptor = "I")
 	public int anInt4438 = -1;
@@ -184,20 +184,20 @@ public final class LocType {
 	public boolean aBoolean220 = false;
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(II)Z")
-	public final boolean method3416(@OriginalArg(1) int arg0) {
+	public final boolean isReady(@OriginalArg(1) int arg0) {
-		if (this.anIntArray378 != null) {
+		if (this.shapes != null) {
-			for (@Pc(18) int local18 = 0; local18 < this.anIntArray378.length; local18++) {
+			for (@Pc(18) int local18 = 0; local18 < this.shapes.length; local18++) {
-				if (arg0 == this.anIntArray378[local18]) {
+				if (arg0 == this.shapes[local18]) {
-					return Static121.aClass153_45.method4491(0, this.anIntArray379[local18] & 0xFFFF);
+					return Static121.modelsArchive.isFileReady(0, this.models[local18] & 0xFFFF);
 				}
 			}
 			return true;
-		} else if (this.anIntArray379 == null) {
+		} else if (this.models == null) {
 			return true;
 		} else if (arg0 == 10) {
 			@Pc(71) boolean local71 = true;
-			for (@Pc(73) int local73 = 0; local73 < this.anIntArray379.length; local73++) {
+			for (@Pc(73) int local73 = 0; local73 < this.models.length; local73++) {
-				local71 &= Static121.aClass153_45.method4491(0, this.anIntArray379[local73] & 0xFFFF);
+				local71 &= Static121.modelsArchive.isFileReady(0, this.models[local73] & 0xFFFF);
 			}
 			return local71;
 		} else {
@@ -208,16 +208,16 @@ public final class LocType {
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(I)Lclient!pb;")
 	public final LocType getMultiLoc() {
 		@Pc(26) int local26 = -1;
-		if (this.anInt4425 != -1) {
+		if (this.multiLocVarbit != -1) {
-			local26 = Static155.getVarbit(this.anInt4425);
+			local26 = Static155.getVarbit(this.multiLocVarbit);
-		} else if (this.anInt4431 != -1) {
+		} else if (this.multiLocVarp != -1) {
-			local26 = Static7.varps[this.anInt4431];
+			local26 = Static7.varps[this.multiLocVarp];
 		}
-		if (local26 < 0 || local26 >= this.anIntArray380.length - 1 || this.anIntArray380[local26] == -1) {
+		if (local26 < 0 || local26 >= this.multiLocs.length - 1 || this.multiLocs[local26] == -1) {
-			@Pc(84) int local84 = this.anIntArray380[this.anIntArray380.length - 1];
+			@Pc(84) int local84 = this.multiLocs[this.multiLocs.length - 1];
-			return local84 == -1 ? null : Static271.method4601(local84);
+			return local84 == -1 ? null : Static271.get(local84);
 		} else {
-			return Static271.method4601(this.anIntArray380[local26]);
+			return Static271.get(this.multiLocs[local26]);
 		}
 	}
 
@@ -230,22 +230,22 @@ public final class LocType {
 		}
 		@Pc(46) int local46;
 		@Pc(48) int local48;
-		if (this.anIntArray378 == null) {
+		if (this.shapes == null) {
 			if (arg1 != 10) {
 				return null;
 			}
-			if (this.anIntArray379 == null) {
+			if (this.models == null) {
 				return null;
 			}
-			local46 = this.anIntArray379.length;
+			local46 = this.models.length;
 			for (local48 = 0; local48 < local46; local48++) {
-				@Pc(60) int local60 = this.anIntArray379[local48];
+				@Pc(60) int local60 = this.models[local48];
 				if (local10) {
 					local60 += 65536;
 				}
 				local7 = (RawModel) Static169.aClass99_24.get((long) local60);
 				if (local7 == null) {
-					local7 = Static77.method1686(Static121.aClass153_45, local60 & 0xFFFF);
+					local7 = Static77.create(Static121.modelsArchive, local60 & 0xFFFF);
 					if (local7 == null) {
 						return null;
 					}
@@ -255,16 +255,16 @@ public final class LocType {
 					Static169.aClass99_24.put(local7, (long) local60);
 				}
 				if (local46 > 1) {
-					Static274.aClass8_Sub5Array5[local48] = local7;
+					Static274.tempModels[local48] = local7;
 				}
 			}
 			if (local46 > 1) {
-				local7 = new RawModel(Static274.aClass8_Sub5Array5, local46);
+				local7 = new RawModel(Static274.tempModels, local46);
 			}
 		} else {
 			local46 = -1;
-			for (local48 = 0; local48 < this.anIntArray378.length; local48++) {
+			for (local48 = 0; local48 < this.shapes.length; local48++) {
-				if (arg1 == this.anIntArray378[local48]) {
+				if (arg1 == this.shapes[local48]) {
 					local46 = local48;
 					break;
 				}
@@ -272,13 +272,13 @@ public final class LocType {
 			if (local46 == -1) {
 				return null;
 			}
-			local48 = this.anIntArray379[local46];
+			local48 = this.models[local46];
 			if (local10) {
 				local48 += 65536;
 			}
 			local7 = (RawModel) Static169.aClass99_24.get((long) local48);
 			if (local7 == null) {
-				local7 = Static77.method1686(Static121.aClass153_45, local48 & 0xFFFF);
+				local7 = Static77.create(Static121.modelsArchive, local48 & 0xFFFF);
 				if (local7 == null) {
 					return null;
 				}
@@ -289,21 +289,21 @@ public final class LocType {
 			}
 		}
 		@Pc(211) boolean local211;
-		if (this.anInt4396 == 128 && this.anInt4404 == 128 && this.anInt4399 == 128) {
+		if (this.resizeX == 128 && this.resizeY == 128 && this.resizeZ == 128) {
 			local211 = false;
 		} else {
 			local211 = true;
 		}
 		@Pc(230) boolean local230;
-		if (this.anInt4408 == 0 && this.anInt4411 == 0 && this.anInt4434 == 0) {
+		if (this.translateX == 0 && this.translateY == 0 && this.translateZ == 0) {
 			local230 = false;
 		} else {
 			local230 = true;
 		}
-		@Pc(265) RawModel local265 = new RawModel(local7, arg0 == 0 && !local211 && !local230, this.aShortArray61 == null, this.aShortArray60 == null, true);
+		@Pc(265) RawModel local265 = new RawModel(local7, arg0 == 0 && !local211 && !local230, this.recolorSource == null, this.retextureSource == null, true);
 		if (arg1 == 4 && arg0 > 3) {
 			local265.method1682();
-			local265.method1672(45, 0, -45);
+			local265.translate(45, 0, -45);
 		}
 		@Pc(285) int local285 = arg0 & 0x3;
 		if (local285 == 1) {
@@ -314,38 +314,38 @@ public final class LocType {
 			local265.method1689();
 		}
 		@Pc(315) int local315;
-		if (this.aShortArray61 != null) {
+		if (this.recolorSource != null) {
-			for (local315 = 0; local315 < this.aShortArray61.length; local315++) {
+			for (local315 = 0; local315 < this.recolorSource.length; local315++) {
 				if (this.aByteArray63 == null || this.aByteArray63.length <= local315) {
-					local265.method1687(this.aShortArray61[local315], this.aShortArray63[local315]);
+					local265.recolor(this.recolorSource[local315], this.recolorDestination[local315]);
 				} else {
-					local265.method1687(this.aShortArray61[local315], Static62.aShortArray19[this.aByteArray63[local315] & 0xFF]);
+					local265.recolor(this.recolorSource[local315], Static62.aShortArray19[this.aByteArray63[local315] & 0xFF]);
 				}
 			}
 		}
-		if (this.aShortArray60 != null) {
+		if (this.retextureSource != null) {
-			for (local315 = 0; local315 < this.aShortArray60.length; local315++) {
+			for (local315 = 0; local315 < this.retextureSource.length; local315++) {
-				local265.method1669(this.aShortArray60[local315], this.aShortArray62[local315]);
+				local265.retexture(this.retextureSource[local315], this.retextureDestination[local315]);
 			}
 		}
 		if (local211) {
-			local265.method1665(this.anInt4396, this.anInt4404, this.anInt4399);
+			local265.method1665(this.resizeX, this.resizeY, this.resizeZ);
 		}
 		if (local230) {
-			local265.method1672(this.anInt4408, this.anInt4411, this.anInt4434);
+			local265.translate(this.translateX, this.translateY, this.translateZ);
 		}
 		return local265;
 	}
 
 	@OriginalMember(owner = "client!pb", name = "c", descriptor = "(I)V")
-	public final void method3421() {
+	public final void postDecode() {
 		if (this.anInt4429 == -1) {
 			this.anInt4429 = 0;
-			if (this.anIntArray379 != null && (this.anIntArray378 == null || this.anIntArray378[0] == 10)) {
+			if (this.models != null && (this.shapes == null || this.shapes[0] == 10)) {
 				this.anInt4429 = 1;
 			}
 			for (@Pc(30) int local30 = 0; local30 < 5; local30++) {
-				if (this.aClass100Array130[local30] != null) {
+				if (this.ops[local30] != null) {
 					this.anInt4429 = 1;
 					break;
 				}
@@ -357,13 +357,13 @@ public final class LocType {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "d", descriptor = "(I)Z")
-	public final boolean method3422() {
+	public final boolean hasAreaSound() {
-		if (this.anIntArray380 == null) {
+		if (this.multiLocs == null) {
 			return this.sound != -1 || this.anIntArray381 != null;
 		}
-		for (@Pc(44) int local44 = 0; local44 < this.anIntArray380.length; local44++) {
+		for (@Pc(44) int local44 = 0; local44 < this.multiLocs.length; local44++) {
-			if (this.anIntArray380[local44] != -1) {
+			if (this.multiLocs[local44] != -1) {
-				@Pc(70) LocType local70 = Static271.method4601(this.anIntArray380[local44]);
+				@Pc(70) LocType local70 = Static271.get(this.multiLocs[local44]);
 				if (local70.sound != -1 || local70.anIntArray381 != null) {
 					return true;
 				}
@@ -373,63 +373,63 @@ public final class LocType {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(IIB)I")
-	public final int method3423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final int getParam(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		if (this.aClass133_19 == null) {
+		if (this.params == null) {
 			return arg0;
 		} else {
-			@Pc(21) IntNode local21 = (IntNode) this.aClass133_19.get((long) arg1);
+			@Pc(21) IntNode local21 = (IntNode) this.params.get((long) arg1);
 			return local21 == null ? arg0 : local21.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method3424(@OriginalArg(1) Buffer arg0) {
+	public final void decode(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.g1();
 			if (local9 == 0) {
 				return;
 			}
-			this.method3425(arg0, local9);
+			this.decode(arg0, local9);
 		}
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method3425(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
+	private void decode(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
-		@Pc(18) int local18;
+		@Pc(18) int defaultMultiLoc;
-		@Pc(38) int local38;
+		@Pc(38) int len;
 		if (arg1 == 1) {
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			if (local18 > 0) {
+			if (defaultMultiLoc > 0) {
-				if (this.anIntArray379 == null || Static87.aBoolean130) {
+				if (this.models == null || Static87.aBoolean130) {
-					this.anIntArray378 = new int[local18];
+					this.shapes = new int[defaultMultiLoc];
-					this.anIntArray379 = new int[local18];
+					this.models = new int[defaultMultiLoc];
-					for (local38 = 0; local38 < local18; local38++) {
+					for (len = 0; len < defaultMultiLoc; len++) {
-						this.anIntArray379[local38] = arg0.g2();
+						this.models[len] = arg0.g2();
-						this.anIntArray378[local38] = arg0.g1();
+						this.shapes[len] = arg0.g1();
 					}
 				} else {
-					arg0.offset += local18 * 3;
+					arg0.offset += defaultMultiLoc * 3;
 				}
 			}
 		} else if (arg1 == 2) {
-			this.aClass100_830 = arg0.gjstr();
+			this.name = arg0.gjstr();
 		} else if (arg1 == 5) {
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			if (local18 > 0) {
+			if (defaultMultiLoc > 0) {
-				if (this.anIntArray379 == null || Static87.aBoolean130) {
+				if (this.models == null || Static87.aBoolean130) {
-					this.anIntArray379 = new int[local18];
+					this.models = new int[defaultMultiLoc];
-					this.anIntArray378 = null;
+					this.shapes = null;
-					for (local38 = 0; local38 < local18; local38++) {
+					for (len = 0; len < defaultMultiLoc; len++) {
-						this.anIntArray379[local38] = arg0.g2();
+						this.models[len] = arg0.g2();
 					}
 				} else {
-					arg0.offset += local18 * 2;
+					arg0.offset += defaultMultiLoc * 2;
 				}
 			}
 		} else if (arg1 == 14) {
-			this.anInt4397 = arg0.g1();
+			this.width = arg0.g1();
 		} else if (arg1 == 15) {
-			this.anInt4403 = arg0.g1();
+			this.length = arg0.g1();
 		} else if (arg1 == 17) {
 			this.anInt4435 = 0;
 			this.aBoolean207 = false;
@@ -451,37 +451,37 @@ public final class LocType {
 		} else if (arg1 == 27) {
 			this.anInt4435 = 1;
 		} else if (arg1 == 28) {
-			this.anInt4428 = arg0.g1();
+			this.wallDecorOffsetScale = arg0.g1();
 		} else if (arg1 == 29) {
 			this.anInt4407 = arg0.g1s();
 		} else if (arg1 == 39) {
 			this.anInt4405 = arg0.g1s() * 5;
 		} else if (arg1 >= 30 && arg1 < 35) {
-			this.aClass100Array130[arg1 - 30] = arg0.gjstr();
+			this.ops[arg1 - 30] = arg0.gjstr();
-			if (this.aClass100Array130[arg1 - 30].method3111(LocalizedText.HIDDEN)) {
+			if (this.ops[arg1 - 30].equalsIgnoreCase(LocalizedText.HIDDEN)) {
-				this.aClass100Array130[arg1 - 30] = null;
+				this.ops[arg1 - 30] = null;
 			}
 		} else if (arg1 == 40) {
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			this.aShortArray61 = new short[local18];
+			this.recolorSource = new short[defaultMultiLoc];
-			this.aShortArray63 = new short[local18];
+			this.recolorDestination = new short[defaultMultiLoc];
-			for (local38 = 0; local38 < local18; local38++) {
+			for (len = 0; len < defaultMultiLoc; len++) {
-				this.aShortArray61[local38] = (short) arg0.g2();
+				this.recolorSource[len] = (short) arg0.g2();
-				this.aShortArray63[local38] = (short) arg0.g2();
+				this.recolorDestination[len] = (short) arg0.g2();
 			}
 		} else if (arg1 == 41) {
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			this.aShortArray62 = new short[local18];
+			this.retextureDestination = new short[defaultMultiLoc];
-			this.aShortArray60 = new short[local18];
+			this.retextureSource = new short[defaultMultiLoc];
-			for (local38 = 0; local38 < local18; local38++) {
+			for (len = 0; len < defaultMultiLoc; len++) {
-				this.aShortArray60[local38] = (short) arg0.g2();
+				this.retextureSource[len] = (short) arg0.g2();
-				this.aShortArray62[local38] = (short) arg0.g2();
+				this.retextureDestination[len] = (short) arg0.g2();
 			}
 		} else if (arg1 == 42) {
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			this.aByteArray63 = new byte[local18];
+			this.aByteArray63 = new byte[defaultMultiLoc];
-			for (local38 = 0; local38 < local18; local38++) {
+			for (len = 0; len < defaultMultiLoc; len++) {
-				this.aByteArray63[local38] = arg0.g1s();
+				this.aByteArray63[len] = arg0.g1s();
 			}
 		} else if (arg1 == 60) {
 			this.anInt4400 = arg0.g2();
@@ -490,19 +490,19 @@ public final class LocType {
 		} else if (arg1 == 64) {
 			this.aBoolean215 = false;
 		} else if (arg1 == 65) {
-			this.anInt4396 = arg0.g2();
+			this.resizeX = arg0.g2();
 		} else if (arg1 == 66) {
-			this.anInt4404 = arg0.g2();
+			this.resizeY = arg0.g2();
 		} else if (arg1 == 67) {
-			this.anInt4399 = arg0.g2();
+			this.resizeZ = arg0.g2();
 		} else if (arg1 == 69) {
-			this.anInt4433 = arg0.g1();
+			this.blockedSides = arg0.g1();
 		} else if (arg1 == 70) {
-			this.anInt4408 = arg0.g2s();
+			this.translateX = arg0.g2s();
 		} else if (arg1 == 71) {
-			this.anInt4411 = arg0.g2s();
+			this.translateY = arg0.g2s();
 		} else if (arg1 == 72) {
-			this.anInt4434 = arg0.g2s();
+			this.translateZ = arg0.g2s();
 		} else if (arg1 == 73) {
 			this.aBoolean206 = true;
 		} else if (arg1 == 74) {
@@ -510,30 +510,30 @@ public final class LocType {
 		} else if (arg1 == 75) {
 			this.anInt4438 = arg0.g1();
 		} else if (arg1 == 77 || arg1 == 92) {
-			local18 = -1;
+			defaultMultiLoc = -1;
-			this.anInt4425 = arg0.g2();
+			this.multiLocVarbit = arg0.g2();
-			if (this.anInt4425 == 65535) {
+			if (this.multiLocVarbit == 65535) {
-				this.anInt4425 = -1;
+				this.multiLocVarbit = -1;
 			}
-			this.anInt4431 = arg0.g2();
+			this.multiLocVarp = arg0.g2();
-			if (this.anInt4431 == 65535) {
+			if (this.multiLocVarp == 65535) {
-				this.anInt4431 = -1;
+				this.multiLocVarp = -1;
 			}
 			if (arg1 == 92) {
-				local18 = arg0.g2();
+				defaultMultiLoc = arg0.g2();
-				if (local18 == 65535) {
+				if (defaultMultiLoc == 65535) {
-					local18 = -1;
+					defaultMultiLoc = -1;
 				}
 			}
-			local38 = arg0.g1();
+			len = arg0.g1();
-			this.anIntArray380 = new int[local38 + 2];
+			this.multiLocs = new int[len + 2];
-			for (@Pc(790) int local790 = 0; local790 <= local38; local790++) {
+			for (@Pc(790) int local790 = 0; local790 <= len; local790++) {
-				this.anIntArray380[local790] = arg0.g2();
+				this.multiLocs[local790] = arg0.g2();
-				if (this.anIntArray380[local790] == 65535) {
+				if (this.multiLocs[local790] == 65535) {
-					this.anIntArray380[local790] = -1;
+					this.multiLocs[local790] = -1;
 				}
 			}
-			this.anIntArray380[local38 + 1] = local18;
+			this.multiLocs[len + 1] = defaultMultiLoc;
 		} else if (arg1 == 78) {
 			this.sound = arg0.g2();
 			this.soundRadius = arg0.g1();
@@ -541,10 +541,10 @@ public final class LocType {
 			this.anInt4419 = arg0.g2();
 			this.anInt4414 = arg0.g2();
 			this.soundRadius = arg0.g1();
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			this.anIntArray381 = new int[local18];
+			this.anIntArray381 = new int[defaultMultiLoc];
-			for (local38 = 0; local38 < local18; local38++) {
+			for (len = 0; len < defaultMultiLoc; len++) {
-				this.anIntArray381[local38] = arg0.g2();
+				this.anIntArray381[len] = arg0.g2();
 			}
 		} else if (arg1 == 81) {
 			this.aByte15 = 2;
@@ -558,7 +558,7 @@ public final class LocType {
 		} else if (arg1 == 90) {
 			this.aBoolean211 = true;
 		} else if (arg1 == 91) {
-			this.aBoolean208 = true;
+			this.members = true;
 		} else if (arg1 == 93) {
 			this.aByte15 = 3;
 			this.aShort26 = (short) arg0.g2();
@@ -569,26 +569,26 @@ public final class LocType {
 		} else if (arg1 == 96) {
 			this.aBoolean213 = true;
 		} else if (arg1 == 97) {
-			this.aBoolean218 = true;
+			this.mapSceneRotated = true;
 		} else if (arg1 == 98) {
 			this.aBoolean214 = true;
 		} else if (arg1 == 99) {
-			this.anInt4406 = arg0.g1();
+			this.cursor1Op = arg0.g1();
-			this.anInt4416 = arg0.g2();
+			this.cursor1 = arg0.g2();
 		} else if (arg1 == 100) {
-			this.anInt4420 = arg0.g1();
+			this.cursor2Op = arg0.g1();
-			this.anInt4423 = arg0.g2();
+			this.cursor2 = arg0.g2();
 		} else if (arg1 == 101) {
-			this.anInt4395 = arg0.g1();
+			this.mapSceneAngleOffset = arg0.g1();
 		} else if (arg1 == 102) {
-			this.anInt4415 = arg0.g2();
+			this.mapSceneId = arg0.g2();
 		} else if (arg1 == 249) {
-			local18 = arg0.g1();
+			defaultMultiLoc = arg0.g1();
-			if (this.aClass133_19 == null) {
+			if (this.params == null) {
-				local38 = Static165.clp2(local18);
+				len = Static165.clp2(defaultMultiLoc);
-				this.aClass133_19 = new HashTable(local38);
+				this.params = new HashTable(len);
 			}
-			for (local38 = 0; local38 < local18; local38++) {
+			for (len = 0; len < defaultMultiLoc; len++) {
 				@Pc(576) boolean local576 = arg0.g1() == 1;
 				@Pc(580) int local580 = arg0.g3();
 				@Pc(589) Node local589;
@@ -597,19 +597,19 @@ public final class LocType {
 				} else {
 					local589 = new IntNode(arg0.g4());
 				}
-				this.aClass133_19.put(local589, (long) local580);
+				this.params.put(local589, (long) local580);
 			}
 		}
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(Z)Z")
-	public final boolean method3426() {
+	public final boolean isReady() {
-		if (this.anIntArray379 == null) {
+		if (this.models == null) {
 			return true;
 		}
 		@Pc(13) boolean local13 = true;
-		for (@Pc(15) int local15 = 0; local15 < this.anIntArray379.length; local15++) {
+		for (@Pc(15) int local15 = 0; local15 < this.models.length; local15++) {
-			local13 &= Static121.aClass153_45.method4491(0, this.anIntArray379[local15] & 0xFFFF);
+			local13 &= Static121.modelsArchive.isFileReady(0, this.models[local15] & 0xFFFF);
 		}
 		return local13;
 	}
@@ -621,20 +621,20 @@ public final class LocType {
 		@Pc(79) GlModel local79;
 		@Pc(24) int local24;
 		@Pc(177) int local177;
-		if (this.anIntArray378 == null) {
+		if (this.shapes == null) {
 			if (arg2 != 10) {
 				return null;
 			}
-			if (this.anIntArray379 == null) {
+			if (this.models == null) {
 				return null;
 			}
-			local24 = this.anIntArray379.length;
+			local24 = this.models.length;
 			if (local24 == 0) {
 				return null;
 			}
 			@Pc(135) long local135 = 0L;
 			for (@Pc(137) int local137 = 0; local137 < local24; local137++) {
-				local135 = (long) this.anIntArray379[local137] + local135 * 67783L;
+				local135 = (long) this.models[local137] + local135 * 67783L;
 			}
 			if (arg1) {
 				local135 = ~local135;
@@ -643,16 +643,16 @@ public final class LocType {
 			if (local79 == null) {
 				@Pc(175) RawModel local175 = null;
 				for (local177 = 0; local177 < local24; local177++) {
-					local175 = Static77.method1686(Static121.aClass153_45, this.anIntArray379[local177] & 0xFFFF);
+					local175 = Static77.create(Static121.modelsArchive, this.models[local177] & 0xFFFF);
 					if (local175 == null) {
 						return null;
 					}
 					if (local24 > 1) {
-						Static274.aClass8_Sub5Array5[local177] = local175;
+						Static274.tempModels[local177] = local175;
 					}
 				}
 				if (local24 > 1) {
-					local175 = new RawModel(Static274.aClass8_Sub5Array5, local24);
+					local175 = new RawModel(Static274.tempModels, local24);
 				}
 				local79 = new GlModel(local175, local10, local17, arg1);
 				Static169.aClass99_24.put(local79, local135);
@@ -660,8 +660,8 @@ public final class LocType {
 		} else {
 			local24 = -1;
 			@Pc(26) int local26;
-			for (local26 = 0; local26 < this.anIntArray378.length; local26++) {
+			for (local26 = 0; local26 < this.shapes.length; local26++) {
-				if (this.anIntArray378[local26] == arg2) {
+				if (this.shapes[local26] == arg2) {
 					local24 = local26;
 					break;
 				}
@@ -669,13 +669,13 @@ public final class LocType {
 			if (local24 == -1) {
 				return null;
 			}
-			local26 = this.anIntArray379[local24];
+			local26 = this.models[local24];
 			if (arg1) {
 				local26 += 65536;
 			}
 			local79 = (GlModel) Static169.aClass99_24.get((long) local26);
 			if (local79 == null) {
-				@Pc(90) RawModel local90 = Static77.method1686(Static121.aClass153_45, local26 & 0xFFFF);
+				@Pc(90) RawModel local90 = Static77.create(Static121.modelsArchive, local26 & 0xFFFF);
 				if (local90 == null) {
 					return null;
 				}
@@ -687,9 +687,9 @@ public final class LocType {
 		if (arg2 == 2 && arg0 > 3) {
 			local236 = !local236;
 		}
-		@Pc(264) boolean local264 = this.anInt4404 == 128 && this.anInt4411 == 0;
+		@Pc(264) boolean local264 = this.resizeY == 128 && this.translateY == 0;
-		@Pc(294) boolean local294 = arg0 == 0 && this.anInt4396 == 128 && this.anInt4399 == 128 && this.anInt4408 == 0 && this.anInt4434 == 0 && !local236;
+		@Pc(294) boolean local294 = arg0 == 0 && this.resizeX == 128 && this.resizeZ == 128 && this.translateX == 0 && this.translateZ == 0 && !local236;
-		@Pc(351) GlModel local351 = local79.method4117(local294, local264, this.aShortArray61 == null, local79.method4094() == local10, arg0 == 0 && !local236, true, local17 == local79.method4115(), !local236, this.aShortArray60 == null);
+		@Pc(351) GlModel local351 = local79.method4117(local294, local264, this.recolorSource == null, local79.method4094() == local10, arg0 == 0 && !local236, true, local17 == local79.method4115(), !local236, this.retextureSource == null);
 		if (local236) {
 			local351.method4122();
 		}
@@ -705,21 +705,21 @@ public final class LocType {
 		} else if (local374 == 3) {
 			local351.method4093();
 		}
-		if (this.aShortArray61 != null) {
+		if (this.recolorSource != null) {
-			for (local177 = 0; local177 < this.aShortArray61.length; local177++) {
+			for (local177 = 0; local177 < this.recolorSource.length; local177++) {
-				local351.method4109(this.aShortArray61[local177], this.aShortArray63[local177]);
+				local351.method4109(this.recolorSource[local177], this.recolorDestination[local177]);
 			}
 		}
-		if (this.aShortArray60 != null) {
+		if (this.retextureSource != null) {
-			for (local177 = 0; local177 < this.aShortArray60.length; local177++) {
+			for (local177 = 0; local177 < this.retextureSource.length; local177++) {
-				local351.method4107(this.aShortArray60[local177], this.aShortArray62[local177]);
+				local351.method4107(this.retextureSource[local177], this.retextureDestination[local177]);
 			}
 		}
-		if (this.anInt4396 != 128 || this.anInt4404 != 128 || this.anInt4399 != 128) {
+		if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-			local351.method4559(this.anInt4396, this.anInt4404, this.anInt4399);
+			local351.resize(this.resizeX, this.resizeY, this.resizeZ);
 		}
-		if (this.anInt4408 != 0 || this.anInt4411 != 0 || this.anInt4434 != 0) {
+		if (this.translateX != 0 || this.translateY != 0 || this.translateZ != 0) {
-			local351.method4575(this.anInt4408, this.anInt4411, this.anInt4434);
+			local351.method4575(this.translateX, this.translateY, this.translateZ);
 		}
 		if (local10 != local351.method4094()) {
 			local351.method4105(local10);
@@ -734,7 +734,7 @@ public final class LocType {
 	public final Class139 method3428(@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) boolean arg6, @OriginalArg(7) SoftwareIndexedSprite arg7, @OriginalArg(9) boolean arg8, @OriginalArg(10) int arg9) {
 		@Pc(29) long local29;
 		if (GlRenderer.enabled) {
-			if (this.anIntArray378 == null) {
+			if (this.shapes == null) {
 				local29 = (this.anInt4426 << 10) + arg0;
 			} else {
 				local29 = arg0 + (this.anInt4426 << 10) + (arg3 << 3);
@@ -776,7 +776,7 @@ public final class LocType {
 			Static171.aClass139_1.aClass36_Sub1_3 = local265;
 			return Static171.aClass139_1;
 		}
-		if (this.anIntArray378 == null) {
+		if (this.shapes == null) {
 			local29 = (this.anInt4426 << 10) + arg0;
 		} else {
 			local29 = (arg3 << 3) + ((this.anInt4426 << 10) + arg0);
@@ -827,7 +827,7 @@ public final class LocType {
 	public final Class139 method3429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SoftwareIndexedSprite arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int[][] arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12) {
 		@Pc(30) long local30;
 		if (!GlRenderer.enabled) {
-			if (this.anIntArray378 == null) {
+			if (this.shapes == null) {
 				local30 = (this.anInt4426 << 10) + arg5;
 			} else {
 				local30 = arg5 + (this.anInt4426 << 10) + (arg11 << 3);
@@ -862,7 +862,7 @@ public final class LocType {
 			Static171.aClass139_1.aClass8_10 = local195;
 			return Static171.aClass139_1;
 		}
-		if (this.anIntArray378 == null) {
+		if (this.shapes == null) {
 			local30 = arg5 + (this.anInt4426 << 10);
 		} else {
 			local30 = (arg11 << 3) + ((this.anInt4426 << 10) + arg5);
@@ -907,10 +907,10 @@ public final class LocType {
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!na;II)Lclient!na;")
 	public final JagString method3430(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
-		if (this.aClass133_19 == null) {
+		if (this.params == null) {
 			return arg0;
 		} else {
-			@Pc(26) StringNode local26 = (StringNode) this.aClass133_19.get((long) arg1);
+			@Pc(26) StringNode local26 = (StringNode) this.params.get((long) arg1);
 			return local26 == null ? arg0 : local26.value;
 		}
 	}

client/src/main/java/Model.java

@@ -218,7 +218,7 @@ public abstract class Model extends Entity {
 	}
 
 	@OriginalMember(owner = "client!ak", name = "b", descriptor = "(III)V")
-	public abstract void method4559(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
+	public abstract void resize(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
 
 	@OriginalMember(owner = "client!ak", name = "a", descriptor = "(ZZZ)Lclient!ak;")
 	public abstract Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2);

client/src/main/java/MsiType.java

@@ -10,13 +10,13 @@ public final class MsiType {
 	public int anInt11;
 
 	@OriginalMember(owner = "client!aa", name = "i", descriptor = "I")
-	public int anInt12;
+	public int spriteId;
 
 	@OriginalMember(owner = "client!aa", name = "s", descriptor = "Z")
 	public boolean aBoolean2 = false;
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!wa;I)V")
-	public final void method6(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
+	public final void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		while (true) {
 			@Pc(5) int local5 = arg0.g1();
 			if (local5 == 0) {
@@ -27,21 +27,21 @@ public final class MsiType {
 	}
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IB)Lclient!ek;")
-	public final SoftwareIndexedSprite method9(@OriginalArg(0) int arg0) {
+	public final SoftwareIndexedSprite getSprite(@OriginalArg(0) int arg0) {
-		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.aClass99_27.get((long) (arg0 << 16 | this.anInt12));
+		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.sprites.get((long) (arg0 << 16 | this.spriteId));
 		if (local17 != null) {
 			return local17;
 		}
-		Static250.aClass153_101.isFileReady(this.anInt12);
+		Static250.spritesArchive.isFileReady(this.spriteId);
-		local17 = Static164.method3119(this.anInt12, Static250.aClass153_101);
+		local17 = Static164.loadSoftwareIndexedSprite(this.spriteId, Static250.spritesArchive);
 		if (local17 != null) {
-			local17.method1389(Static173.anInt4183, Static85.anInt2262, Static266.anInt5344);
+			local17.adjustPalette(Static173.redDelta, Static85.greenDelta, Static266.blueDelta);
 			local17.innerWidth = local17.width;
-			local17.anInt4276 = local17.anInt4278;
+			local17.innerHeight = local17.height;
 			for (@Pc(59) int local59 = 0; local59 < arg0; local59++) {
-				local17.method1395();
+				local17.flipVertical();
 			}
-			Static219.aClass99_27.put(local17, (long) (arg0 << 16 | this.anInt12));
+			Static219.sprites.put(local17, (long) (arg0 << 16 | this.spriteId));
 		}
 		return local17;
 	}
@@ -49,13 +49,13 @@ public final class MsiType {
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(ILclient!wa;II)V")
 	private void method11(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) {
 		if (arg0 == 1) {
-			this.anInt12 = arg1.g2();
+			this.spriteId = arg1.g2();
 		} else if (arg0 == 2) {
 			this.anInt11 = arg1.g3();
 		} else if (arg0 == 3) {
 			this.aBoolean2 = true;
 		} else if (arg0 == 4) {
-			this.anInt12 = -1;
+			this.spriteId = -1;
 		}
 	}
 }

client/src/main/java/Npc.java

@@ -26,20 +26,20 @@ public final class Npc extends PathingEntity {
 		if (this.type == null) {
 			return;
 		}
-		@Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
+		@Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.get(this.anInt3369) : null;
-		@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.method941(this.anInt3366);
+		@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.get(this.anInt3366);
-		@Pc(74) Model local74 = this.type.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
+		@Pc(74) Model local74 = this.type.getBodyModel(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
 		if (local74 == null) {
 			return;
 		}
 		this.anInt3413 = local74.method4549();
 		@Pc(84) NpcType local84 = this.type;
-		if (local84.anIntArray357 != null) {
+		if (local84.multiNpcs != null) {
 			local84 = local84.getMultiNpc();
 		}
 		@Pc(140) Model local140;
-		if (Static209.characterShadowsOn && local84.aBoolean180) {
+		if (Static209.characterShadowsOn && local84.shadow) {
-			local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
+			local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.soze, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
 			if (GlRenderer.enabled) {
 				@Pc(144) float local144 = GlRenderer.method4179();
 				@Pc(146) float local146 = GlRenderer.method4166();
@@ -77,18 +77,18 @@ public final class Npc extends PathingEntity {
 			if (local140 != null) {
 				local74 = ((SoftwareModel) local74).method4588(local140);
 			}
-			if (this.type.anInt3713 == 1) {
+			if (this.type.soze == 1) {
 				local74.aBoolean303 = true;
 			}
 			local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
 			return;
 		}
-		if (this.type.anInt3713 == 1) {
+		if (this.type.soze == 1) {
 			local74.aBoolean303 = true;
 		}
 		local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
 		if (local140 != null) {
-			if (this.type.anInt3713 == 1) {
+			if (this.type.soze == 1) {
 				local140.aBoolean303 = true;
 			}
 			local140.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
@@ -98,10 +98,10 @@ public final class Npc extends PathingEntity {
 	@OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I")
 	@Override
 	protected final int method2688() {
-		if (Static266.game != 0 && this.type.anIntArray357 != null) {
+		if (Static266.game != 0 && this.type.multiNpcs != null) {
 			@Pc(17) NpcType local17 = this.type.getMultiNpc();
-			if (local17 != null && local17.anInt3737 != -1) {
+			if (local17 != null && local17.basId != -1) {
-				return local17.anInt3737;
+				return local17.basId;
 			}
 		}
 		return this.anInt3365;

client/src/main/java/NpcType.java

@@ -7,19 +7,19 @@ import org.openrs2.deob.annotation.Pc;
 public final class NpcType {
 
 	@OriginalMember(owner = "client!me", name = "b", descriptor = "[S")
-	private short[] aShortArray37;
+	private short[] retextureSource;
 
 	@OriginalMember(owner = "client!me", name = "c", descriptor = "[B")
 	private byte[] aByteArray51;
 
 	@OriginalMember(owner = "client!me", name = "d", descriptor = "[S")
-	private short[] aShortArray38;
+	private short[] recolorDestination;
 
 	@OriginalMember(owner = "client!me", name = "g", descriptor = "[I")
 	private int[] anIntArray354;
 
 	@OriginalMember(owner = "client!me", name = "o", descriptor = "[S")
-	private short[] aShortArray39;
+	private short[] recolorSource;
 
 	@OriginalMember(owner = "client!me", name = "t", descriptor = "[[I")
 	private int[][] anIntArrayArray28;
@@ -28,49 +28,49 @@ public final class NpcType {
 	private int[][] anIntArrayArray29;
 
 	@OriginalMember(owner = "client!me", name = "J", descriptor = "[S")
-	private short[] aShortArray40;
+	private short[] retextureDestination;
 
 	@OriginalMember(owner = "client!me", name = "K", descriptor = "Lclient!sc;")
-	private HashTable aClass133_15;
+	private HashTable params;
 
 	@OriginalMember(owner = "client!me", name = "X", descriptor = "I")
-	public int anInt3741;
+	public int id;
 
 	@OriginalMember(owner = "client!me", name = "cb", descriptor = "[I")
 	private int[] anIntArray356;
 
 	@OriginalMember(owner = "client!me", name = "hb", descriptor = "[I")
-	public int[] anIntArray357;
+	public int[] multiNpcs;
 
 	@OriginalMember(owner = "client!me", name = "A", descriptor = "I")
-	public int anInt3728 = -1;
+	public int idleSound = -1;
 
 	@OriginalMember(owner = "client!me", name = "I", descriptor = "Z")
 	public boolean aBoolean183 = true;
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "I")
-	public int anInt3713 = 1;
+	public int soze = 1;
 
 	@OriginalMember(owner = "client!me", name = "q", descriptor = "Z")
 	public boolean aBoolean181 = true;
 
 	@OriginalMember(owner = "client!me", name = "O", descriptor = "I")
-	public int anInt3734 = -1;
+	public int runSound = -1;
 
 	@OriginalMember(owner = "client!me", name = "r", descriptor = "S")
 	public short aShort23 = 0;
 
 	@OriginalMember(owner = "client!me", name = "L", descriptor = "Lclient!na;")
-	public JagString aClass100_738 = Static266.aClass100_1010;
+	public JagString name = Static266.aClass100_1010;
 
 	@OriginalMember(owner = "client!me", name = "x", descriptor = "I")
-	public int anInt3726 = -1;
+	public int combatLevel = -1;
 
 	@OriginalMember(owner = "client!me", name = "Z", descriptor = "Z")
 	public boolean aBoolean184 = true;
 
 	@OriginalMember(owner = "client!me", name = "l", descriptor = "I")
-	public int anInt3719 = -1;
+	public int cursor1 = -1;
 
 	@OriginalMember(owner = "client!me", name = "U", descriptor = "I")
 	private int anInt3738 = 0;
@@ -85,22 +85,22 @@ public final class NpcType {
 	public byte aByte12 = -16;
 
 	@OriginalMember(owner = "client!me", name = "H", descriptor = "I")
-	public int anInt3732 = -1;
+	public int prayerIcon = -1;
 
 	@OriginalMember(owner = "client!me", name = "F", descriptor = "B")
 	public byte aByte10 = 0;
 
 	@OriginalMember(owner = "client!me", name = "e", descriptor = "Z")
-	public boolean aBoolean180 = true;
+	public boolean shadow = true;
 
 	@OriginalMember(owner = "client!me", name = "ab", descriptor = "S")
 	public short aShort24 = 0;
 
 	@OriginalMember(owner = "client!me", name = "db", descriptor = "I")
-	public int anInt3743 = -1;
+	public int cursor2Op = -1;
 
 	@OriginalMember(owner = "client!me", name = "R", descriptor = "I")
-	public int anInt3736 = -1;
+	public int hitBarId = -1;
 
 	@OriginalMember(owner = "client!me", name = "h", descriptor = "I")
 	private int anInt3715 = 0;
@@ -112,10 +112,10 @@ public final class NpcType {
 	public int anInt3733 = 32;
 
 	@OriginalMember(owner = "client!me", name = "u", descriptor = "[Lclient!na;")
-	public final JagString[] aClass100Array116 = new JagString[5];
+	public final JagString[] ops = new JagString[5];
 
 	@OriginalMember(owner = "client!me", name = "ib", descriptor = "I")
-	public int anInt3747 = -1;
+	public int walkSound = -1;
 
 	@OriginalMember(owner = "client!me", name = "bb", descriptor = "B")
 	public byte aByte13 = -96;
@@ -124,10 +124,10 @@ public final class NpcType {
 	public byte aByte11 = 7;
 
 	@OriginalMember(owner = "client!me", name = "S", descriptor = "I")
-	public int anInt3737 = -1;
+	public int basId = -1;
 
 	@OriginalMember(owner = "client!me", name = "mb", descriptor = "I")
-	public int anInt3750 = -1;
+	public int cursor1Op = -1;
 
 	@OriginalMember(owner = "client!me", name = "gb", descriptor = "I")
 	public int soundRadius = 0;
@@ -136,19 +136,19 @@ public final class NpcType {
 	private int anInt3731 = 128;
 
 	@OriginalMember(owner = "client!me", name = "s", descriptor = "I")
-	private int anInt3723 = -1;
+	private int multiNpcVarbit = -1;
 
 	@OriginalMember(owner = "client!me", name = "fb", descriptor = "I")
-	public int anInt3745 = -1;
+	public int crawlSound = -1;
 
 	@OriginalMember(owner = "client!me", name = "D", descriptor = "I")
 	public int anInt3730 = -1;
 
 	@OriginalMember(owner = "client!me", name = "Q", descriptor = "I")
-	public int anInt3735 = -1;
+	public int cursor2 = -1;
 
 	@OriginalMember(owner = "client!me", name = "lb", descriptor = "I")
-	private int anInt3749 = -1;
+	private int multiNpcVarp = -1;
 
 	@OriginalMember(owner = "client!me", name = "ob", descriptor = "I")
 	public int anInt3752 = -1;
@@ -156,32 +156,32 @@ public final class NpcType {
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(B)Lclient!me;")
 	public final NpcType getMultiNpc() {
 		@Pc(5) int local5 = -1;
-		if (this.anInt3723 != -1) {
+		if (this.multiNpcVarbit != -1) {
-			local5 = Static155.getVarbit(this.anInt3723);
+			local5 = Static155.getVarbit(this.multiNpcVarbit);
-		} else if (this.anInt3749 != -1) {
+		} else if (this.multiNpcVarp != -1) {
-			local5 = Static7.varps[this.anInt3749];
+			local5 = Static7.varps[this.multiNpcVarp];
 		}
-		if (local5 < 0 || local5 >= this.anIntArray357.length - 1 || this.anIntArray357[local5] == -1) {
+		if (local5 < 0 || local5 >= this.multiNpcs.length - 1 || this.multiNpcs[local5] == -1) {
-			@Pc(55) int local55 = this.anIntArray357[this.anIntArray357.length - 1];
+			@Pc(55) int local55 = this.multiNpcs[this.multiNpcs.length - 1];
-			return local55 == -1 ? null : Static214.method4363(local55);
+			return local55 == -1 ? null : Static214.get(local55);
 		} else {
-			return Static214.method4363(this.anIntArray357[local5]);
+			return Static214.get(this.multiNpcs[local5]);
 		}
 	}
 
 	@OriginalMember(owner = "client!me", name = "b", descriptor = "(B)Z")
-	public final boolean method2933() {
+	public final boolean isMultiNpcValid() {
-		if (this.anIntArray357 == null) {
+		if (this.multiNpcs == null) {
 			return true;
 		}
 		@Pc(16) int local16 = -1;
-		if (this.anInt3723 != -1) {
+		if (this.multiNpcVarbit != -1) {
-			local16 = Static155.getVarbit(this.anInt3723);
+			local16 = Static155.getVarbit(this.multiNpcVarbit);
-		} else if (this.anInt3749 != -1) {
+		} else if (this.multiNpcVarp != -1) {
-			local16 = Static7.varps[this.anInt3749];
+			local16 = Static7.varps[this.multiNpcVarp];
 		}
-		if (local16 < 0 || local16 >= this.anIntArray357.length - 1 || this.anIntArray357[local16] == -1) {
+		if (local16 < 0 || local16 >= this.multiNpcs.length - 1 || this.multiNpcs[local16] == -1) {
-			@Pc(62) int local62 = this.anIntArray357[this.anIntArray357.length - 1];
+			@Pc(62) int local62 = this.multiNpcs[this.multiNpcs.length - 1];
 			return local62 != -1;
 		} else {
 			return true;
@@ -189,14 +189,14 @@ public final class NpcType {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(I)Z")
-	public final boolean method2935() {
+	public final boolean hasAreaSound() {
-		if (this.anIntArray357 == null) {
+		if (this.multiNpcs == null) {
-			return this.anInt3728 != -1 || this.anInt3747 != -1 || this.anInt3734 != -1;
+			return this.idleSound != -1 || this.walkSound != -1 || this.runSound != -1;
 		}
-		for (@Pc(35) int local35 = 0; local35 < this.anIntArray357.length; local35++) {
+		for (@Pc(35) int local35 = 0; local35 < this.multiNpcs.length; local35++) {
-			if (this.anIntArray357[local35] != -1) {
+			if (this.multiNpcs[local35] != -1) {
-				@Pc(60) NpcType local60 = Static214.method4363(this.anIntArray357[local35]);
+				@Pc(60) NpcType local60 = Static214.get(this.multiNpcs[local35]);
-				if (local60.anInt3728 != -1 || local60.anInt3747 != -1 || local60.anInt3734 != -1) {
+				if (local60.idleSound != -1 || local60.walkSound != -1 || local60.runSound != -1) {
 					return true;
 				}
 			}
@@ -205,22 +205,22 @@ public final class NpcType {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(III)I")
-	public final int method2936(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public final int getParam(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		if (this.aClass133_15 == null) {
+		if (this.params == null) {
 			return arg1;
 		} else {
-			@Pc(18) IntNode local18 = (IntNode) this.aClass133_15.get((long) arg0);
+			@Pc(18) IntNode local18 = (IntNode) this.params.get((long) arg0);
 			return local18 == null ? arg1 : local18.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;")
-	public final Model method2937(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType arg6, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType arg8) {
+	public final Model getBodyModel(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType arg6, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType arg8) {
-		if (this.anIntArray357 != null) {
+		if (this.multiNpcs != null) {
 			@Pc(13) NpcType local13 = this.getMultiNpc();
-			return local13 == null ? null : local13.method2937(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+			return local13 == null ? null : local13.getBodyModel(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 		}
-		@Pc(40) Model local40 = (Model) Static125.aClass99_18.get((long) this.anInt3741);
+		@Pc(40) Model local40 = (Model) Static125.aClass99_18.get((long) this.id);
 		@Pc(46) boolean local46;
 		@Pc(173) int local173;
 		@Pc(235) int local235;
@@ -236,7 +236,7 @@ public final class NpcType {
 		if (local40 == null) {
 			local46 = false;
 			for (@Pc(48) int local48 = 0; local48 < this.anIntArray356.length; local48++) {
-				if (this.anIntArray356[local48] != -1 && !Static86.aClass153_37.method4491(0, this.anIntArray356[local48])) {
+				if (this.anIntArray356[local48] != -1 && !Static86.modelsArchive.isFileReady(0, this.anIntArray356[local48])) {
 					local46 = true;
 				}
 			}
@@ -246,15 +246,15 @@ public final class NpcType {
 			@Pc(84) RawModel[] local84 = new RawModel[this.anIntArray356.length];
 			for (@Pc(86) int local86 = 0; local86 < this.anIntArray356.length; local86++) {
 				if (this.anIntArray356[local86] != -1) {
-					local84[local86] = Static77.method1686(Static86.aClass153_37, this.anIntArray356[local86]);
+					local84[local86] = Static77.create(Static86.modelsArchive, this.anIntArray356[local86]);
 					if (this.anIntArrayArray29 != null && this.anIntArrayArray29[local86] != null && local84[local86] != null) {
-						local84[local86].method1672(this.anIntArrayArray29[local86][0], this.anIntArrayArray29[local86][1], this.anIntArrayArray29[local86][2]);
+						local84[local86].translate(this.anIntArrayArray29[local86][0], this.anIntArrayArray29[local86][1], this.anIntArrayArray29[local86][2]);
 					}
 				}
 			}
 			@Pc(156) BasType local156 = null;
-			if (this.anInt3737 != -1) {
+			if (this.basId != -1) {
-				local156 = Static90.method1856(this.anInt3737);
+				local156 = Static90.method1856(this.basId);
 			}
 			if (local156 != null && local156.modelRotateTranslate != null) {
 				for (local173 = 0; local173 < local156.modelRotateTranslate.length; local173++) {
@@ -305,7 +305,7 @@ public final class NpcType {
 							local84[local173].method1684(local207, local214, local228);
 						}
 						if (local235 != 0 || local221 != 0 || local200 != 0) {
-							local84[local173].method1672(local235, local221, local200);
+							local84[local173].translate(local235, local221, local200);
 						}
 					}
 				}
@@ -316,25 +316,25 @@ public final class NpcType {
 			} else {
 				local593 = new RawModel(local84, local84.length);
 			}
-			if (this.aShortArray38 != null) {
+			if (this.recolorDestination != null) {
-				for (local173 = 0; local173 < this.aShortArray38.length; local173++) {
+				for (local173 = 0; local173 < this.recolorDestination.length; local173++) {
 					if (this.aByteArray51 == null || this.aByteArray51.length <= local173) {
-						local593.method1687(this.aShortArray38[local173], this.aShortArray39[local173]);
+						local593.recolor(this.recolorDestination[local173], this.recolorSource[local173]);
 					} else {
-						local593.method1687(this.aShortArray38[local173], Static232.aShortArray74[this.aByteArray51[local173] & 0xFF]);
+						local593.recolor(this.recolorDestination[local173], Static232.aShortArray74[this.aByteArray51[local173] & 0xFF]);
 					}
 				}
 			}
-			if (this.aShortArray40 != null) {
+			if (this.retextureDestination != null) {
-				for (local173 = 0; local173 < this.aShortArray40.length; local173++) {
+				for (local173 = 0; local173 < this.retextureDestination.length; local173++) {
-					local593.method1669(this.aShortArray40[local173], this.aShortArray37[local173]);
+					local593.retexture(this.retextureDestination[local173], this.retextureSource[local173]);
 				}
 			}
-			local40 = local593.method1679(this.anInt3715 + 64, this.anInt3738 + 850, -30, -50, -30);
+			local40 = local593.createModel(this.anInt3715 + 64, this.anInt3738 + 850, -30, -50, -30);
 			if (GlRenderer.enabled) {
 				((GlModel) local40).method4111(false, false, false, false, false, true);
 			}
-			Static125.aClass99_18.put(local40, (long) this.anInt3741);
+			Static125.aClass99_18.put(local40, (long) this.id);
 		}
 		local46 = false;
 		@Pc(721) boolean local721 = false;
@@ -343,14 +343,14 @@ public final class NpcType {
 		local173 = arg0 == null ? 0 : arg0.length;
 		for (local235 = 0; local235 < local173; local235++) {
 			if (arg0[local235] != null) {
-				@Pc(753) SeqType local753 = Static36.method941(arg0[local235].anInt5396);
+				@Pc(753) SeqType local753 = Static36.get(arg0[local235].anInt5396);
-				if (local753.anIntArray473 != null) {
+				if (local753.frames != null) {
 					Static146.aClass144Array1[local235] = local753;
 					local207 = arg0[local235].anInt5398;
 					local46 = true;
 					local200 = arg0[local235].anInt5399;
-					local214 = local753.anIntArray473[local200];
+					local214 = local753.frames[local200];
-					Static6.aClass3_Sub2_Sub7Array1[local235] = Static72.method1566(local214 >>> 16);
+					Static6.aClass3_Sub2_Sub7Array1[local235] = Static72.getAnimFrameset(local214 >>> 16);
 					local214 &= 0xFFFF;
 					Static107.anIntArray259[local235] = local214;
 					if (Static6.aClass3_Sub2_Sub7Array1[local235] != null) {
@@ -358,11 +358,11 @@ public final class NpcType {
 						local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
 						local725 |= local753.aBoolean278;
 					}
-					if ((local753.aBoolean277 || Static204.applyTweening) && local207 != -1 && local753.anIntArray473.length > local207) {
+					if ((local753.tween || Static204.applyTweening) && local207 != -1 && local753.frames.length > local207) {
 						Static71.anIntArray147[local235] = local753.anIntArray474[local200];
 						Static214.anIntArray492[local235] = arg0[local235].anInt5404;
-						local228 = local753.anIntArray473[local207];
+						local228 = local753.frames[local207];
-						Static131.aClass3_Sub2_Sub7Array5[local235] = Static72.method1566(local228 >>> 16);
+						Static131.aClass3_Sub2_Sub7Array5[local235] = Static72.getAnimFrameset(local228 >>> 16);
 						local228 &= 0xFFFF;
 						Static61.anIntArray148[local235] = local228;
 						if (Static131.aClass3_Sub2_Sub7Array5[local235] != null) {
@@ -381,7 +381,7 @@ public final class NpcType {
 		if (!local46 && arg8 == null && arg6 == null) {
 			@Pc(933) Model local933 = local40.method4572(true, true, true);
 			if (this.anInt3729 != 128 || this.anInt3731 != 128) {
-				local933.method4559(this.anInt3729, this.anInt3731, this.anInt3729);
+				local933.resize(this.anInt3729, this.anInt3731, this.anInt3729);
 			}
 			return local933;
 		}
@@ -392,24 +392,24 @@ public final class NpcType {
 		@Pc(964) AnimFrameset local964 = null;
 		@Pc(1040) int local1040;
 		if (arg8 != null) {
-			local235 = arg8.anIntArray473[arg5];
+			local235 = arg8.frames[arg5];
 			local228 = local235 >>> 16;
 			local235 &= 0xFFFF;
-			local962 = Static72.method1566(local228);
+			local962 = Static72.getAnimFrameset(local228);
 			if (local962 != null) {
 				local723 |= local962.isColorTransformed(local235);
 				local721 |= local962.isAlphaTransformed(local235);
 				local725 |= arg8.aBoolean278;
 			}
-			if ((arg8.aBoolean277 || Static204.applyTweening) && arg3 != -1 && arg8.anIntArray473.length > arg3) {
+			if ((arg8.tween || Static204.applyTweening) && arg3 != -1 && arg8.frames.length > arg3) {
 				local200 = arg8.anIntArray474[arg5];
-				local221 = arg8.anIntArray473[arg3];
+				local221 = arg8.frames[arg3];
 				local1040 = local221 >>> 16;
 				local221 &= 0xFFFF;
 				if (local228 == local1040) {
 					local964 = local962;
 				} else {
-					local964 = Static72.method1566(local221 >>> 16);
+					local964 = Static72.getAnimFrameset(local221 >>> 16);
 				}
 				if (local964 != null) {
 					local723 |= local964.isColorTransformed(local221);
@@ -423,24 +423,24 @@ public final class NpcType {
 		local300 = 0;
 		@Pc(1092) AnimFrameset local1092 = null;
 		if (arg6 != null) {
-			local228 = arg6.anIntArray473[arg2];
+			local228 = arg6.frames[arg2];
 			local324 = local228 >>> 16;
 			local228 &= 0xFFFF;
-			local1088 = Static72.method1566(local324);
+			local1088 = Static72.getAnimFrameset(local324);
 			if (local1088 != null) {
 				local723 |= local1088.isColorTransformed(local228);
 				local721 |= local1088.isAlphaTransformed(local228);
 				local725 |= arg6.aBoolean278;
 			}
-			if ((arg6.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg1 < arg6.anIntArray473.length) {
+			if ((arg6.tween || Static204.applyTweening) && arg1 != -1 && arg1 < arg6.frames.length) {
 				local300 = arg6.anIntArray474[arg2];
-				local1040 = arg6.anIntArray473[arg1];
+				local1040 = arg6.frames[arg1];
 				local318 = local1040 >>> 16;
 				local1040 &= 0xFFFF;
 				if (local318 == local324) {
 					local1092 = local1088;
 				} else {
-					local1092 = Static72.method1566(local1040 >>> 16);
+					local1092 = Static72.getAnimFrameset(local1040 >>> 16);
 				}
 				if (local1092 != null) {
 					local723 |= local1092.isColorTransformed(local1040);
@@ -469,29 +469,29 @@ public final class NpcType {
 			Static146.aClass144Array1[local318] = null;
 		}
 		if (this.anInt3729 != 128 || this.anInt3731 != 128) {
-			local1218.method4559(this.anInt3729, this.anInt3731, this.anInt3729);
+			local1218.resize(this.anInt3729, this.anInt3731, this.anInt3729);
 		}
 		return local1218;
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(ILclient!na;Z)Lclient!na;")
-	public final JagString method2938(@OriginalArg(0) int arg0, @OriginalArg(1) JagString arg1) {
+	public final JagString getParam(@OriginalArg(0) int arg0, @OriginalArg(1) JagString arg1) {
-		if (this.aClass133_15 == null) {
+		if (this.params == null) {
 			return arg1;
 		} else {
-			@Pc(18) StringNode local18 = (StringNode) this.aClass133_15.get((long) arg0);
+			@Pc(18) StringNode local18 = (StringNode) this.params.get((long) arg0);
 			return local18 == null ? arg1 : local18.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method2939(@OriginalArg(0) Buffer arg0) {
+	public final void decode(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.g1();
 			if (local9 == 0) {
 				return;
 			}
-			this.method2944(local9, arg0);
+			this.decode(local9, arg0);
 		}
 	}
 
@@ -500,18 +500,18 @@ public final class NpcType {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!tk;IIII)Lclient!ak;")
-	public final Model method2943(@OriginalArg(0) SeqType arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
+	public final Model getHeadModel(@OriginalArg(0) SeqType arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
-		if (this.anIntArray357 != null) {
+		if (this.multiNpcs != null) {
 			@Pc(13) NpcType local13 = this.getMultiNpc();
-			return local13 == null ? null : local13.method2943(arg0, arg1, arg2, arg3);
+			return local13 == null ? null : local13.getHeadModel(arg0, arg1, arg2, arg3);
 		} else if (this.anIntArray354 == null) {
 			return null;
 		} else {
-			@Pc(41) Model local41 = (Model) Static262.aClass99_35.get((long) this.anInt3741);
+			@Pc(41) Model local41 = (Model) Static262.headModels.get((long) this.id);
 			if (local41 == null) {
 				@Pc(46) boolean local46 = false;
 				for (@Pc(48) int local48 = 0; local48 < this.anIntArray354.length; local48++) {
-					if (!Static86.aClass153_37.method4491(0, this.anIntArray354[local48])) {
+					if (!Static86.modelsArchive.isFileReady(0, this.anIntArray354[local48])) {
 						local46 = true;
 					}
 				}
@@ -520,7 +520,7 @@ public final class NpcType {
 				}
 				@Pc(82) RawModel[] local82 = new RawModel[this.anIntArray354.length];
 				for (@Pc(84) int local84 = 0; local84 < this.anIntArray354.length; local84++) {
-					local82[local84] = Static77.method1686(Static86.aClass153_37, this.anIntArray354[local84]);
+					local82[local84] = Static77.create(Static86.modelsArchive, this.anIntArray354[local84]);
 				}
 				@Pc(119) RawModel local119;
 				if (local82.length == 1) {
@@ -529,22 +529,22 @@ public final class NpcType {
 					local119 = new RawModel(local82, local82.length);
 				}
 				@Pc(130) int local130;
-				if (this.aShortArray38 != null) {
+				if (this.recolorDestination != null) {
-					for (local130 = 0; local130 < this.aShortArray38.length; local130++) {
+					for (local130 = 0; local130 < this.recolorDestination.length; local130++) {
 						if (this.aByteArray51 == null || local130 >= this.aByteArray51.length) {
-							local119.method1687(this.aShortArray38[local130], this.aShortArray39[local130]);
+							local119.recolor(this.recolorDestination[local130], this.recolorSource[local130]);
 						} else {
-							local119.method1687(this.aShortArray38[local130], Static232.aShortArray74[this.aByteArray51[local130] & 0xFF]);
+							local119.recolor(this.recolorDestination[local130], Static232.aShortArray74[this.aByteArray51[local130] & 0xFF]);
 						}
 					}
 				}
-				if (this.aShortArray40 != null) {
+				if (this.retextureDestination != null) {
-					for (local130 = 0; local130 < this.aShortArray40.length; local130++) {
+					for (local130 = 0; local130 < this.retextureDestination.length; local130++) {
-						local119.method1669(this.aShortArray40[local130], this.aShortArray37[local130]);
+						local119.retexture(this.retextureDestination[local130], this.retextureSource[local130]);
 					}
 				}
-				local41 = local119.method1679(64, 768, -50, -10, -50);
+				local41 = local119.createModel(64, 768, -50, -10, -50);
-				Static262.aClass99_35.put(local41, (long) this.anInt3741);
+				Static262.headModels.put(local41, (long) this.id);
 			}
 			if (arg0 != null) {
 				local41 = arg0.method4215(local41, arg2, arg1, arg3);
@@ -554,7 +554,7 @@ public final class NpcType {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(IILclient!wa;)V")
-	private void method2944(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1) {
+	private void decode(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1) {
 		@Pc(12) int local12;
 		@Pc(18) int local18;
 		if (arg0 == 1) {
@@ -567,29 +567,29 @@ public final class NpcType {
 				}
 			}
 		} else if (arg0 == 2) {
-			this.aClass100_738 = arg1.gjstr();
+			this.name = arg1.gjstr();
 		} else if (arg0 == 12) {
-			this.anInt3713 = arg1.g1();
+			this.soze = arg1.g1();
 		} else if (arg0 >= 30 && arg0 < 35) {
-			this.aClass100Array116[arg0 - 30] = arg1.gjstr();
+			this.ops[arg0 - 30] = arg1.gjstr();
-			if (this.aClass100Array116[arg0 - 30].method3111(LocalizedText.HIDDEN)) {
+			if (this.ops[arg0 - 30].equalsIgnoreCase(LocalizedText.HIDDEN)) {
-				this.aClass100Array116[arg0 - 30] = null;
+				this.ops[arg0 - 30] = null;
 			}
 		} else if (arg0 == 40) {
 			local12 = arg1.g1();
-			this.aShortArray39 = new short[local12];
+			this.recolorSource = new short[local12];
-			this.aShortArray38 = new short[local12];
+			this.recolorDestination = new short[local12];
 			for (local18 = 0; local18 < local12; local18++) {
-				this.aShortArray38[local18] = (short) arg1.g2();
+				this.recolorDestination[local18] = (short) arg1.g2();
-				this.aShortArray39[local18] = (short) arg1.g2();
+				this.recolorSource[local18] = (short) arg1.g2();
 			}
 		} else if (arg0 == 41) {
 			local12 = arg1.g1();
-			this.aShortArray37 = new short[local12];
+			this.retextureSource = new short[local12];
-			this.aShortArray40 = new short[local12];
+			this.retextureDestination = new short[local12];
 			for (local18 = 0; local18 < local12; local18++) {
-				this.aShortArray40[local18] = (short) arg1.g2();
+				this.retextureDestination[local18] = (short) arg1.g2();
-				this.aShortArray37[local18] = (short) arg1.g2();
+				this.retextureSource[local18] = (short) arg1.g2();
 			}
 		} else if (arg0 == 42) {
 			local12 = arg1.g1();
@@ -606,7 +606,7 @@ public final class NpcType {
 		} else if (arg0 == 93) {
 			this.aBoolean184 = false;
 		} else if (arg0 == 95) {
-			this.anInt3726 = arg1.g2();
+			this.combatLevel = arg1.g2();
 		} else if (arg0 == 97) {
 			this.anInt3729 = arg1.g2();
 		} else if (arg0 == 98) {
@@ -618,20 +618,20 @@ public final class NpcType {
 		} else if (arg0 == 101) {
 			this.anInt3738 = arg1.g1s() * 5;
 		} else if (arg0 == 102) {
-			this.anInt3732 = arg1.g2();
+			this.prayerIcon = arg1.g2();
 		} else if (arg0 == 103) {
 			this.anInt3733 = arg1.g2();
 		} else {
 			@Pc(297) int local297;
 			if (arg0 == 106 || arg0 == 118) {
-				this.anInt3723 = arg1.g2();
+				this.multiNpcVarbit = arg1.g2();
 				local12 = -1;
-				if (this.anInt3723 == 65535) {
+				if (this.multiNpcVarbit == 65535) {
-					this.anInt3723 = -1;
+					this.multiNpcVarbit = -1;
 				}
-				this.anInt3749 = arg1.g2();
+				this.multiNpcVarp = arg1.g2();
-				if (this.anInt3749 == 65535) {
+				if (this.multiNpcVarp == 65535) {
-					this.anInt3749 = -1;
+					this.multiNpcVarp = -1;
 				}
 				if (arg0 == 118) {
 					local12 = arg1.g2();
@@ -640,20 +640,20 @@ public final class NpcType {
 					}
 				}
 				local18 = arg1.g1();
-				this.anIntArray357 = new int[local18 + 2];
+				this.multiNpcs = new int[local18 + 2];
 				for (local297 = 0; local297 <= local18; local297++) {
-					this.anIntArray357[local297] = arg1.g2();
+					this.multiNpcs[local297] = arg1.g2();
-					if (this.anIntArray357[local297] == 65535) {
+					if (this.multiNpcs[local297] == 65535) {
-						this.anIntArray357[local297] = -1;
+						this.multiNpcs[local297] = -1;
 					}
 				}
-				this.anIntArray357[local18 + 1] = local12;
+				this.multiNpcs[local18 + 1] = local12;
 			} else if (arg0 == 107) {
 				this.aBoolean183 = false;
 			} else if (arg0 == 109) {
 				this.aBoolean181 = false;
 			} else if (arg0 == 111) {
-				this.aBoolean180 = false;
+				this.shadow = false;
 			} else if (arg0 == 113) {
 				this.aShort24 = (short) arg1.g2();
 				this.aShort23 = (short) arg1.g2();
@@ -676,7 +676,7 @@ public final class NpcType {
 					local439[2] = arg1.g1s();
 				}
 			} else if (arg0 == 122) {
-				this.anInt3736 = arg1.g2();
+				this.hitBarId = arg1.g2();
 			} else if (arg0 == 123) {
 				this.anInt3730 = arg1.g2();
 			} else if (arg0 == 125) {
@@ -684,40 +684,40 @@ public final class NpcType {
 			} else if (arg0 == 126) {
 				this.anInt3739 = arg1.g2();
 			} else if (arg0 == 127) {
-				this.anInt3737 = arg1.g2();
+				this.basId = arg1.g2();
 			} else if (arg0 == 128) {
 				arg1.g1();
 			} else if (arg0 == 134) {
-				this.anInt3728 = arg1.g2();
+				this.idleSound = arg1.g2();
-				if (this.anInt3728 == 65535) {
+				if (this.idleSound == 65535) {
-					this.anInt3728 = -1;
+					this.idleSound = -1;
 				}
-				this.anInt3745 = arg1.g2();
+				this.crawlSound = arg1.g2();
-				if (this.anInt3745 == 65535) {
+				if (this.crawlSound == 65535) {
-					this.anInt3745 = -1;
+					this.crawlSound = -1;
 				}
-				this.anInt3747 = arg1.g2();
+				this.walkSound = arg1.g2();
-				if (this.anInt3747 == 65535) {
+				if (this.walkSound == 65535) {
-					this.anInt3747 = -1;
+					this.walkSound = -1;
 				}
-				this.anInt3734 = arg1.g2();
+				this.runSound = arg1.g2();
-				if (this.anInt3734 == 65535) {
+				if (this.runSound == 65535) {
-					this.anInt3734 = -1;
+					this.runSound = -1;
 				}
 				this.soundRadius = arg1.g1();
 			} else if (arg0 == 135) {
-				this.anInt3750 = arg1.g1();
+				this.cursor1Op = arg1.g1();
-				this.anInt3719 = arg1.g2();
+				this.cursor1 = arg1.g2();
 			} else if (arg0 == 136) {
-				this.anInt3743 = arg1.g1();
+				this.cursor2Op = arg1.g1();
-				this.anInt3735 = arg1.g2();
+				this.cursor2 = arg1.g2();
 			} else if (arg0 == 137) {
 				this.anInt3752 = arg1.g2();
 			} else if (arg0 == 249) {
 				local12 = arg1.g1();
-				if (this.aClass133_15 == null) {
+				if (this.params == null) {
 					local18 = Static165.clp2(local12);
-					this.aClass133_15 = new HashTable(local18);
+					this.params = new HashTable(local18);
 				}
 				for (local18 = 0; local18 < local12; local18++) {
 					@Pc(592) boolean local592 = arg1.g1() == 1;
@@ -728,7 +728,7 @@ public final class NpcType {
 					} else {
 						local605 = new IntNode(arg1.g4());
 					}
-					this.aClass133_15.put(local605, (long) local596);
+					this.params.put(local605, (long) local596);
 				}
 			}
 		}

client/src/main/java/ObjStack.java

@@ -23,7 +23,7 @@ public final class ObjStack extends Entity {
 	@OriginalMember(owner = "client!uj", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
 	@Override
 	public final void method4546(@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) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
-		@Pc(16) Model local16 = Static71.method1439(this.anInt5555).method1824(-1, 0, null, this.anInt5550, 0);
+		@Pc(16) Model local16 = Static71.get(this.anInt5555).getModel(-1, 0, null, this.anInt5550, 0);
 		if (local16 != null) {
 			local16.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 			this.anInt5553 = local16.method4549();

client/src/main/java/ObjType.java

@@ -10,166 +10,166 @@ public final class ObjType {
 	public static final int[] anIntArray213 = new int[99];
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "[S")
-	private short[] aShortArray31;
+	private short[] retextureDestination;
 
 	@OriginalMember(owner = "client!h", name = "g", descriptor = "I")
-	private int anInt2320;
+	private int model;
 
 	@OriginalMember(owner = "client!h", name = "y", descriptor = "[S")
-	private short[] aShortArray32;
+	private short[] retextureSource;
 
 	@OriginalMember(owner = "client!h", name = "z", descriptor = "[I")
-	public int[] anIntArray212;
+	public int[] countCount;
 
 	@OriginalMember(owner = "client!h", name = "G", descriptor = "[S")
-	private short[] aShortArray33;
+	private short[] recolorSource;
 
 	@OriginalMember(owner = "client!h", name = "I", descriptor = "[S")
-	private short[] aShortArray34;
+	private short[] recolorDestination;
 
 	@OriginalMember(owner = "client!h", name = "W", descriptor = "[B")
-	private byte[] aByteArray36;
+	private byte[] recolorDestinationPalette;
 
 	@OriginalMember(owner = "client!h", name = "Y", descriptor = "I")
 	public int anInt2354;
 
 	@OriginalMember(owner = "client!h", name = "nb", descriptor = "Lclient!sc;")
-	public HashTable aClass133_6;
+	public HashTable params;
 
 	@OriginalMember(owner = "client!h", name = "tb", descriptor = "[I")
-	public int[] anIntArray214;
+	public int[] countObj;
 
 	@OriginalMember(owner = "client!h", name = "h", descriptor = "I")
-	public int anInt2321 = -1;
+	public int cursor2 = -1;
 
 	@OriginalMember(owner = "client!h", name = "K", descriptor = "I")
-	private int anInt2344 = -1;
+	private int womanWear3 = -1;
 
 	@OriginalMember(owner = "client!h", name = "l", descriptor = "I")
-	public int anInt2325 = 1;
+	public int cost = 1;
 
 	@OriginalMember(owner = "client!h", name = "e", descriptor = "I")
-	private int anInt2318 = -1;
+	private int womanHead2 = -1;
 
 	@OriginalMember(owner = "client!h", name = "q", descriptor = "I")
-	private int anInt2330 = 0;
+	private int manWearXOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "H", descriptor = "I")
-	private int anInt2342 = -1;
+	private int womanHead = -1;
 
 	@OriginalMember(owner = "client!h", name = "T", descriptor = "I")
-	public int anInt2351 = 0;
+	public int team = 0;
 
 	@OriginalMember(owner = "client!h", name = "E", descriptor = "Lclient!na;")
-	public JagString aClass100_495 = Static78.aClass100_464;
+	public JagString name = Static78.aClass100_464;
 
 	@OriginalMember(owner = "client!h", name = "J", descriptor = "I")
-	private int anInt2343 = 0;
+	private int manWearZOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "V", descriptor = "I")
-	private int anInt2352 = 0;
+	private int ambient = 0;
 
 	@OriginalMember(owner = "client!h", name = "C", descriptor = "I")
-	private int anInt2340 = -1;
+	private int manWear3 = -1;
 
 	@OriginalMember(owner = "client!h", name = "ib", descriptor = "I")
-	private int anInt2364 = -1;
+	private int manHead2 = -1;
 
 	@OriginalMember(owner = "client!h", name = "cb", descriptor = "I")
-	public int anInt2358 = -1;
+	public int certificateTemplate = -1;
 
 	@OriginalMember(owner = "client!h", name = "M", descriptor = "I")
-	private int anInt2346 = 0;
+	private int womanWearXOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "R", descriptor = "I")
-	private int anInt2350 = 128;
+	private int resizeY = 128;
 
 	@OriginalMember(owner = "client!h", name = "A", descriptor = "I")
-	public int anInt2338 = -1;
+	public int cursor1Op = -1;
 
 	@OriginalMember(owner = "client!h", name = "n", descriptor = "I")
-	public int anInt2327 = -1;
+	public int cursor1 = -1;
 
 	@OriginalMember(owner = "client!h", name = "B", descriptor = "I")
-	public int anInt2339 = 0;
+	public int zAngle2d = 0;
 
 	@OriginalMember(owner = "client!h", name = "u", descriptor = "I")
-	public int anInt2334 = -1;
+	public int lentTemplate = -1;
 
 	@OriginalMember(owner = "client!h", name = "hb", descriptor = "I")
-	public int anInt2363 = -1;
+	public int lentLink = -1;
 
 	@OriginalMember(owner = "client!h", name = "r", descriptor = "I")
-	public int anInt2331 = -1;
+	public int womanWear1 = -1;
 
 	@OriginalMember(owner = "client!h", name = "F", descriptor = "I")
-	private int anInt2341 = -1;
+	private int manWear2 = -1;
 
 	@OriginalMember(owner = "client!h", name = "f", descriptor = "I")
-	public int anInt2319 = 0;
+	public int yOffset2d = 0;
 
 	@OriginalMember(owner = "client!h", name = "X", descriptor = "I")
-	public int anInt2353 = 0;
+	public int xAngle2d = 0;
 
 	@OriginalMember(owner = "client!h", name = "ob", descriptor = "I")
-	public int anInt2369 = 0;
+	public int yAngle2d = 0;
 
 	@OriginalMember(owner = "client!h", name = "pb", descriptor = "I")
-	public int anInt2370 = 0;
+	public int dummyItem = 0;
 
 	@OriginalMember(owner = "client!h", name = "w", descriptor = "I")
-	public int anInt2336 = 0;
+	public int stackable = 0;
 
 	@OriginalMember(owner = "client!h", name = "ab", descriptor = "I")
-	public int anInt2356 = -1;
+	public int certificateLink = -1;
 
 	@OriginalMember(owner = "client!h", name = "fb", descriptor = "I")
-	private int anInt2361 = -1;
+	private int womanWear2 = -1;
 
 	@OriginalMember(owner = "client!h", name = "Z", descriptor = "I")
-	public int anInt2355 = -1;
+	public int cursor2Op = -1;
 
 	@OriginalMember(owner = "client!h", name = "mb", descriptor = "I")
-	private int anInt2368 = 128;
+	private int resizeZ = 128;
 
 	@OriginalMember(owner = "client!h", name = "P", descriptor = "Z")
-	public boolean aBoolean131 = false;
+	public boolean members = false;
 
 	@OriginalMember(owner = "client!h", name = "b", descriptor = "I")
-	private int anInt2315 = 0;
+	private int womanWearZOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "db", descriptor = "I")
-	public int anInt2359 = 0;
+	public int xOffset2d = 0;
 
 	@OriginalMember(owner = "client!h", name = "sb", descriptor = "I")
-	private int anInt2372 = -1;
+	private int manHead = -1;
 
 	@OriginalMember(owner = "client!h", name = "rb", descriptor = "I")
-	private int anInt2371 = 0;
+	private int womanWearYOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "eb", descriptor = "I")
-	public int anInt2360 = -1;
+	public int manWear1 = -1;
 
 	@OriginalMember(owner = "client!h", name = "qb", descriptor = "[Lclient!na;")
-	public JagString[] aClass100Array72 = new JagString[] { null, null, LocalizedText.TAKE, null, null };
+	public JagString[] ops = new JagString[] { null, null, LocalizedText.TAKE, null, null };
 
 	@OriginalMember(owner = "client!h", name = "ub", descriptor = "I")
-	private int anInt2373 = 128;
+	private int resizeX = 128;
 
 	@OriginalMember(owner = "client!h", name = "bb", descriptor = "I")
-	private int anInt2357 = 0;
+	private int contrast = 0;
 
 	@OriginalMember(owner = "client!h", name = "N", descriptor = "I")
-	private int anInt2347 = 0;
+	private int manWearYOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "U", descriptor = "[Lclient!na;")
-	public JagString[] aClass100Array71 = new JagString[] { null, null, null, null, LocalizedText.DROP};
+	public JagString[] inventoryOps = new JagString[] { null, null, null, null, LocalizedText.DROP};
 
 	@OriginalMember(owner = "client!h", name = "Ab", descriptor = "I")
-	public int anInt2375 = 2000;
+	public int zoom2d = 2000;
 
 	@OriginalMember(owner = "client!h", name = "xb", descriptor = "Z")
-	public boolean aBoolean132 = false;
+	public boolean stockMarket = false;
 
 	static {
 		@Pc(4) int local4 = 0;
@@ -183,20 +183,20 @@ public final class ObjType {
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(ZZ)Z")
 	public final boolean method1816(@OriginalArg(0) boolean arg0) {
-		@Pc(6) int local6 = this.anInt2372;
+		@Pc(6) int local6 = this.manHead;
-		@Pc(9) int local9 = this.anInt2364;
+		@Pc(9) int local9 = this.manHead2;
 		if (arg0) {
-			local6 = this.anInt2342;
+			local6 = this.womanHead;
-			local9 = this.anInt2318;
+			local9 = this.womanHead2;
 		}
 		if (local6 == -1) {
 			return true;
 		}
 		@Pc(33) boolean local33 = true;
-		if (!Static230.aClass153_95.method4491(0, local6)) {
+		if (!Static230.modelsArchive.isFileReady(0, local6)) {
 			local33 = false;
 		}
-		if (local9 != -1 && !Static230.aClass153_95.method4491(0, local9)) {
+		if (local9 != -1 && !Static230.modelsArchive.isFileReady(0, local9)) {
 			local33 = false;
 		}
 		return local33;
@@ -204,25 +204,25 @@ public final class ObjType {
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(ILclient!na;I)Lclient!na;")
 	public final JagString method1819(@OriginalArg(1) JagString arg0, @OriginalArg(2) int arg1) {
-		if (this.aClass133_6 == null) {
+		if (this.params == null) {
 			return arg0;
 		} else {
-			@Pc(21) StringNode local21 = (StringNode) this.aClass133_6.get((long) arg1);
+			@Pc(21) StringNode local21 = (StringNode) this.params.get((long) arg1);
 			return local21 == null ? arg0 : local21.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(II)Lclient!h;")
 	public final ObjType method1820(@OriginalArg(0) int arg0) {
-		if (this.anIntArray214 != null && arg0 > 1) {
+		if (this.countObj != null && arg0 > 1) {
 			@Pc(23) int local23 = -1;
 			for (@Pc(25) int local25 = 0; local25 < 10; local25++) {
-				if (this.anIntArray212[local25] <= arg0 && this.anIntArray212[local25] != 0) {
+				if (this.countCount[local25] <= arg0 && this.countCount[local25] != 0) {
-					local23 = this.anIntArray214[local25];
+					local23 = this.countObj[local25];
 				}
 			}
 			if (local23 != -1) {
-				return Static71.method1439(local23);
+				return Static71.get(local23);
 			}
 		}
 		return this;
@@ -230,25 +230,25 @@ public final class ObjType {
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(BZ)Z")
 	public final boolean method1822(@OriginalArg(1) boolean arg0) {
-		@Pc(6) int local6 = this.anInt2341;
+		@Pc(6) int local6 = this.manWear2;
-		@Pc(9) int local9 = this.anInt2360;
+		@Pc(9) int local9 = this.manWear1;
-		@Pc(20) int local20 = this.anInt2340;
+		@Pc(20) int local20 = this.manWear3;
 		if (arg0) {
-			local20 = this.anInt2344;
+			local20 = this.womanWear3;
-			local9 = this.anInt2331;
+			local9 = this.womanWear1;
-			local6 = this.anInt2361;
+			local6 = this.womanWear2;
 		}
 		if (local9 == -1) {
 			return true;
 		}
 		@Pc(41) boolean local41 = true;
-		if (!Static230.aClass153_95.method4491(0, local9)) {
+		if (!Static230.modelsArchive.isFileReady(0, local9)) {
 			local41 = false;
 		}
-		if (local6 != -1 && !Static230.aClass153_95.method4491(0, local6)) {
+		if (local6 != -1 && !Static230.modelsArchive.isFileReady(0, local6)) {
 			local41 = false;
 		}
-		if (local20 != -1 && !Static230.aClass153_95.method4491(0, local20)) {
+		if (local20 != -1 && !Static230.modelsArchive.isFileReady(0, local20)) {
 			local41 = false;
 		}
 		return local41;
@@ -256,92 +256,92 @@ public final class ObjType {
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(BLclient!h;Lclient!h;)V")
 	public final void method1823(@OriginalArg(1) ObjType arg0, @OriginalArg(2) ObjType arg1) {
-		this.aByteArray36 = arg0.aByteArray36;
+		this.recolorDestinationPalette = arg0.recolorDestinationPalette;
-		this.anInt2347 = arg0.anInt2347;
+		this.manWearYOff = arg0.manWearYOff;
-		this.aClass133_6 = arg0.aClass133_6;
+		this.params = arg0.params;
-		this.anInt2340 = arg0.anInt2340;
+		this.manWear3 = arg0.manWear3;
-		this.anInt2331 = arg0.anInt2331;
+		this.womanWear1 = arg0.womanWear1;
-		this.anInt2343 = arg0.anInt2343;
+		this.manWearZOff = arg0.manWearZOff;
-		this.aClass100Array71 = new JagString[5];
+		this.inventoryOps = new JagString[5];
-		this.anInt2320 = arg1.anInt2320;
+		this.model = arg1.model;
-		this.anInt2375 = arg1.anInt2375;
+		this.zoom2d = arg1.zoom2d;
-		this.anInt2325 = 0;
+		this.cost = 0;
-		this.anInt2351 = arg0.anInt2351;
+		this.team = arg0.team;
-		this.anInt2342 = arg0.anInt2342;
+		this.womanHead = arg0.womanHead;
-		this.aShortArray34 = arg0.aShortArray34;
+		this.recolorDestination = arg0.recolorDestination;
-		this.anInt2339 = arg1.anInt2339;
+		this.zAngle2d = arg1.zAngle2d;
-		this.anInt2341 = arg0.anInt2341;
+		this.manWear2 = arg0.manWear2;
-		this.anInt2369 = arg1.anInt2369;
+		this.yAngle2d = arg1.yAngle2d;
-		this.anInt2372 = arg0.anInt2372;
+		this.manHead = arg0.manHead;
-		this.anInt2364 = arg0.anInt2364;
+		this.manHead2 = arg0.manHead2;
-		this.anInt2330 = arg0.anInt2330;
+		this.manWearXOff = arg0.manWearXOff;
-		this.anInt2353 = arg1.anInt2353;
+		this.xAngle2d = arg1.xAngle2d;
-		this.anInt2319 = arg1.anInt2319;
+		this.yOffset2d = arg1.yOffset2d;
-		this.anInt2318 = arg0.anInt2318;
+		this.womanHead2 = arg0.womanHead2;
-		this.anInt2346 = arg0.anInt2346;
+		this.womanWearXOff = arg0.womanWearXOff;
-		this.aShortArray33 = arg0.aShortArray33;
+		this.recolorSource = arg0.recolorSource;
-		this.anInt2371 = arg0.anInt2371;
+		this.womanWearYOff = arg0.womanWearYOff;
-		this.anInt2315 = arg0.anInt2315;
+		this.womanWearZOff = arg0.womanWearZOff;
-		this.anInt2359 = arg1.anInt2359;
+		this.xOffset2d = arg1.xOffset2d;
-		this.anInt2360 = arg0.anInt2360;
+		this.manWear1 = arg0.manWear1;
-		this.anInt2361 = arg0.anInt2361;
+		this.womanWear2 = arg0.womanWear2;
-		this.aClass100_495 = arg0.aClass100_495;
+		this.name = arg0.name;
-		this.aShortArray31 = arg0.aShortArray31;
+		this.retextureDestination = arg0.retextureDestination;
-		this.aShortArray32 = arg0.aShortArray32;
+		this.retextureSource = arg0.retextureSource;
-		this.aClass100Array72 = arg0.aClass100Array72;
+		this.ops = arg0.ops;
-		this.aBoolean131 = arg0.aBoolean131;
+		this.members = arg0.members;
-		this.anInt2344 = arg0.anInt2344;
+		this.womanWear3 = arg0.womanWear3;
-		if (arg0.aClass100Array71 != null) {
+		if (arg0.inventoryOps != null) {
 			for (@Pc(157) int local157 = 0; local157 < 4; local157++) {
-				this.aClass100Array71[local157] = arg0.aClass100Array71[local157];
+				this.inventoryOps[local157] = arg0.inventoryOps[local157];
 			}
 		}
-		this.aClass100Array71[4] = LocalizedText.LENT_ITEM_RETURN;
+		this.inventoryOps[4] = LocalizedText.LENT_ITEM_RETURN;
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(IIILclient!tk;II)Lclient!ak;")
-	public final Model method1824(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) SeqType arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+	public final Model getModel(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) SeqType arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
-		if (this.anIntArray214 != null && arg3 > 1) {
+		if (this.countObj != null && arg3 > 1) {
 			@Pc(22) int local22 = -1;
 			for (@Pc(24) int local24 = 0; local24 < 10; local24++) {
-				if (arg3 >= this.anIntArray212[local24] && this.anIntArray212[local24] != 0) {
+				if (arg3 >= this.countCount[local24] && this.countCount[local24] != 0) {
-					local22 = this.anIntArray214[local24];
+					local22 = this.countObj[local24];
 				}
 			}
 			if (local22 != -1) {
-				return Static71.method1439(local22).method1824(arg0, arg1, arg2, 1, arg4);
+				return Static71.get(local22).getModel(arg0, arg1, arg2, 1, arg4);
 			}
 		}
-		@Pc(76) Model local76 = (Model) Static244.aClass99_32.get((long) this.anInt2354);
+		@Pc(76) Model local76 = (Model) Static244.models.get((long) this.anInt2354);
 		if (local76 == null) {
-			@Pc(85) RawModel local85 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
+			@Pc(85) RawModel local85 = Static77.create(Static230.modelsArchive, this.model);
 			if (local85 == null) {
 				return null;
 			}
 			@Pc(97) int local97;
-			if (this.aShortArray34 != null) {
+			if (this.recolorDestination != null) {
-				for (local97 = 0; local97 < this.aShortArray34.length; local97++) {
+				for (local97 = 0; local97 < this.recolorDestination.length; local97++) {
-					if (this.aByteArray36 == null || local97 >= this.aByteArray36.length) {
+					if (this.recolorDestinationPalette == null || local97 >= this.recolorDestinationPalette.length) {
-						local85.method1687(this.aShortArray34[local97], this.aShortArray33[local97]);
+						local85.recolor(this.recolorDestination[local97], this.recolorSource[local97]);
 					} else {
-						local85.method1687(this.aShortArray34[local97], Static259.aShortArray87[this.aByteArray36[local97] & 0xFF]);
+						local85.recolor(this.recolorDestination[local97], Static259.aShortArray87[this.recolorDestinationPalette[local97] & 0xFF]);
 					}
 				}
 			}
-			if (this.aShortArray32 != null) {
+			if (this.retextureSource != null) {
-				for (local97 = 0; local97 < this.aShortArray32.length; local97++) {
+				for (local97 = 0; local97 < this.retextureSource.length; local97++) {
-					local85.method1669(this.aShortArray32[local97], this.aShortArray31[local97]);
+					local85.retexture(this.retextureSource[local97], this.retextureDestination[local97]);
 				}
 			}
-			local76 = local85.method1679(this.anInt2352 + 64, this.anInt2357 + 768, -50, -10, -50);
+			local76 = local85.createModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
-			if (this.anInt2373 != 128 || this.anInt2350 != 128 || this.anInt2368 != 128) {
+			if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-				local76.method4559(this.anInt2373, this.anInt2350, this.anInt2368);
+				local76.resize(this.resizeX, this.resizeY, this.resizeZ);
 			}
 			local76.aBoolean303 = true;
 			if (GlRenderer.enabled) {
 				((GlModel) local76).method4111(false, false, false, false, false, true);
 			}
-			Static244.aClass99_32.put(local76, (long) this.anInt2354);
+			Static244.models.put(local76, (long) this.anInt2354);
 		}
 		if (arg2 != null) {
 			local76 = arg2.method4215(local76, arg0, arg1, arg4);
@@ -354,143 +354,143 @@ public final class ObjType {
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method1827(@OriginalArg(1) Buffer arg0) {
+	public final void decode(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(5) int local5 = arg0.g1();
 			if (local5 == 0) {
 				return;
 			}
-			this.method1828(arg0, local5);
+			this.decode(arg0, local5);
 		}
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(BLclient!wa;I)V")
-	private void method1828(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
+	private void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 1) {
-			this.anInt2320 = arg0.g2();
+			this.model = arg0.g2();
 		} else if (arg1 == 2) {
-			this.aClass100_495 = arg0.gjstr();
+			this.name = arg0.gjstr();
 		} else if (arg1 == 4) {
-			this.anInt2375 = arg0.g2();
+			this.zoom2d = arg0.g2();
 		} else if (arg1 == 5) {
-			this.anInt2353 = arg0.g2();
+			this.xAngle2d = arg0.g2();
 		} else if (arg1 == 6) {
-			this.anInt2369 = arg0.g2();
+			this.yAngle2d = arg0.g2();
 		} else if (arg1 == 7) {
-			this.anInt2359 = arg0.g2();
+			this.xOffset2d = arg0.g2();
-			if (this.anInt2359 > 32767) {
+			if (this.xOffset2d > 32767) {
-				this.anInt2359 -= 65536;
+				this.xOffset2d -= 65536;
 			}
 		} else if (arg1 == 8) {
-			this.anInt2319 = arg0.g2();
+			this.yOffset2d = arg0.g2();
-			if (this.anInt2319 > 32767) {
+			if (this.yOffset2d > 32767) {
-				this.anInt2319 -= 65536;
+				this.yOffset2d -= 65536;
 			}
 		} else if (arg1 == 11) {
-			this.anInt2336 = 1;
+			this.stackable = 1;
 		} else if (arg1 == 12) {
-			this.anInt2325 = arg0.g4();
+			this.cost = arg0.g4();
 		} else if (arg1 == 16) {
-			this.aBoolean131 = true;
+			this.members = true;
 		} else if (arg1 == 23) {
-			this.anInt2360 = arg0.g2();
+			this.manWear1 = arg0.g2();
 		} else if (arg1 == 24) {
-			this.anInt2341 = arg0.g2();
+			this.manWear2 = arg0.g2();
 		} else if (arg1 == 25) {
-			this.anInt2331 = arg0.g2();
+			this.womanWear1 = arg0.g2();
 		} else if (arg1 == 26) {
-			this.anInt2361 = arg0.g2();
+			this.womanWear2 = arg0.g2();
 		} else if (arg1 >= 30 && arg1 < 35) {
-			this.aClass100Array72[arg1 - 30] = arg0.gjstr();
+			this.ops[arg1 - 30] = arg0.gjstr();
-			if (this.aClass100Array72[arg1 - 30].method3111(LocalizedText.HIDDEN)) {
+			if (this.ops[arg1 - 30].equalsIgnoreCase(LocalizedText.HIDDEN)) {
-				this.aClass100Array72[arg1 - 30] = null;
+				this.ops[arg1 - 30] = null;
 			}
 		} else if (arg1 >= 35 && arg1 < 40) {
-			this.aClass100Array71[arg1 - 35] = arg0.gjstr();
+			this.inventoryOps[arg1 - 35] = arg0.gjstr();
 		} else {
 			@Pc(169) int local169;
 			@Pc(179) int local179;
 			if (arg1 == 40) {
 				local169 = arg0.g1();
-				this.aShortArray33 = new short[local169];
+				this.recolorSource = new short[local169];
-				this.aShortArray34 = new short[local169];
+				this.recolorDestination = new short[local169];
 				for (local179 = 0; local179 < local169; local179++) {
-					this.aShortArray34[local179] = (short) arg0.g2();
+					this.recolorDestination[local179] = (short) arg0.g2();
-					this.aShortArray33[local179] = (short) arg0.g2();
+					this.recolorSource[local179] = (short) arg0.g2();
 				}
 			} else if (arg1 == 41) {
 				local169 = arg0.g1();
-				this.aShortArray31 = new short[local169];
+				this.retextureDestination = new short[local169];
-				this.aShortArray32 = new short[local169];
+				this.retextureSource = new short[local169];
 				for (local179 = 0; local179 < local169; local179++) {
-					this.aShortArray32[local179] = (short) arg0.g2();
+					this.retextureSource[local179] = (short) arg0.g2();
-					this.aShortArray31[local179] = (short) arg0.g2();
+					this.retextureDestination[local179] = (short) arg0.g2();
 				}
 			} else if (arg1 == 42) {
 				local169 = arg0.g1();
-				this.aByteArray36 = new byte[local169];
+				this.recolorDestinationPalette = new byte[local169];
 				for (local179 = 0; local179 < local169; local179++) {
-					this.aByteArray36[local179] = arg0.g1s();
+					this.recolorDestinationPalette[local179] = arg0.g1s();
 				}
 			} else if (arg1 == 65) {
-				this.aBoolean132 = true;
+				this.stockMarket = true;
 			} else if (arg1 == 78) {
-				this.anInt2340 = arg0.g2();
+				this.manWear3 = arg0.g2();
 			} else if (arg1 == 79) {
-				this.anInt2344 = arg0.g2();
+				this.womanWear3 = arg0.g2();
 			} else if (arg1 == 90) {
-				this.anInt2372 = arg0.g2();
+				this.manHead = arg0.g2();
 			} else if (arg1 == 91) {
-				this.anInt2342 = arg0.g2();
+				this.womanHead = arg0.g2();
 			} else if (arg1 == 92) {
-				this.anInt2364 = arg0.g2();
+				this.manHead2 = arg0.g2();
 			} else if (arg1 == 93) {
-				this.anInt2318 = arg0.g2();
+				this.womanHead2 = arg0.g2();
 			} else if (arg1 == 95) {
-				this.anInt2339 = arg0.g2();
+				this.zAngle2d = arg0.g2();
 			} else if (arg1 == 96) {
-				this.anInt2370 = arg0.g1();
+				this.dummyItem = arg0.g1();
 			} else if (arg1 == 97) {
-				this.anInt2356 = arg0.g2();
+				this.certificateLink = arg0.g2();
 			} else if (arg1 == 98) {
-				this.anInt2358 = arg0.g2();
+				this.certificateTemplate = arg0.g2();
 			} else if (arg1 >= 100 && arg1 < 110) {
-				if (this.anIntArray214 == null) {
+				if (this.countObj == null) {
-					this.anIntArray214 = new int[10];
+					this.countObj = new int[10];
-					this.anIntArray212 = new int[10];
+					this.countCount = new int[10];
 				}
-				this.anIntArray214[arg1 - 100] = arg0.g2();
+				this.countObj[arg1 - 100] = arg0.g2();
-				this.anIntArray212[arg1 - 100] = arg0.g2();
+				this.countCount[arg1 - 100] = arg0.g2();
 			} else if (arg1 == 110) {
-				this.anInt2373 = arg0.g2();
+				this.resizeX = arg0.g2();
 			} else if (arg1 == 111) {
-				this.anInt2350 = arg0.g2();
+				this.resizeY = arg0.g2();
 			} else if (arg1 == 112) {
-				this.anInt2368 = arg0.g2();
+				this.resizeZ = arg0.g2();
 			} else if (arg1 == 113) {
-				this.anInt2352 = arg0.g1s();
+				this.ambient = arg0.g1s();
 			} else if (arg1 == 114) {
-				this.anInt2357 = arg0.g1s() * 5;
+				this.contrast = arg0.g1s() * 5;
 			} else if (arg1 == 115) {
-				this.anInt2351 = arg0.g1();
+				this.team = arg0.g1();
 			} else if (arg1 == 121) {
-				this.anInt2363 = arg0.g2();
+				this.lentLink = arg0.g2();
 			} else if (arg1 == 122) {
-				this.anInt2334 = arg0.g2();
+				this.lentTemplate = arg0.g2();
 			} else if (arg1 == 125) {
-				this.anInt2330 = arg0.g1s();
+				this.manWearXOff = arg0.g1s();
-				this.anInt2347 = arg0.g1s();
+				this.manWearYOff = arg0.g1s();
-				this.anInt2343 = arg0.g1s();
+				this.manWearZOff = arg0.g1s();
 			} else if (arg1 == 126) {
-				this.anInt2346 = arg0.g1s();
+				this.womanWearXOff = arg0.g1s();
-				this.anInt2371 = arg0.g1s();
+				this.womanWearYOff = arg0.g1s();
-				this.anInt2315 = arg0.g1s();
+				this.womanWearZOff = arg0.g1s();
 			} else if (arg1 == 127) {
-				this.anInt2338 = arg0.g1();
+				this.cursor1Op = arg0.g1();
-				this.anInt2327 = arg0.g2();
+				this.cursor1 = arg0.g2();
 			} else if (arg1 == 128) {
-				this.anInt2355 = arg0.g1();
+				this.cursor2Op = arg0.g1();
-				this.anInt2321 = arg0.g2();
+				this.cursor2 = arg0.g2();
 			} else if (arg1 == 129) {
 				arg0.g1();
 				arg0.g2();
@@ -499,155 +499,155 @@ public final class ObjType {
 				arg0.g2();
 			} else if (arg1 == 249) {
 				local169 = arg0.g1();
-				if (this.aClass133_6 == null) {
+				if (this.params == null) {
 					local179 = Static165.clp2(local169);
-					this.aClass133_6 = new HashTable(local179);
+					this.params = new HashTable(local179);
 				}
 				for (local179 = 0; local179 < local169; local179++) {
 					@Pc(510) boolean local510 = arg0.g1() == 1;
-					@Pc(514) int local514 = arg0.g3();
+					@Pc(514) int id = arg0.g3();
-					@Pc(523) Node local523;
+					@Pc(523) Node node;
 					if (local510) {
-						local523 = new StringNode(arg0.gjstr());
+						node = new StringNode(arg0.gjstr());
 					} else {
-						local523 = new IntNode(arg0.g4());
+						node = new IntNode(arg0.g4());
 					}
-					this.aClass133_6.put(local523, (long) local514);
+					this.params.put(node, (long) id);
 				}
 			}
 		}
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(III)I")
-	public final int method1829(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+	public final int getParam(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		if (this.aClass133_6 == null) {
+		if (this.params == null) {
 			return arg0;
 		} else {
-			@Pc(25) IntNode local25 = (IntNode) this.aClass133_6.get((long) arg1);
+			@Pc(25) IntNode local25 = (IntNode) this.params.get((long) arg1);
 			return local25 == null ? arg0 : local25.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(ZB)Lclient!gb;")
-	public final RawModel method1830(@OriginalArg(0) boolean arg0) {
+	public final RawModel getHeadModel(@OriginalArg(0) boolean arg0) {
-		@Pc(4) int local4 = this.anInt2364;
+		@Pc(4) int local4 = this.manHead2;
-		@Pc(17) int local17 = this.anInt2372;
+		@Pc(17) int local17 = this.manHead;
 		if (arg0) {
-			local4 = this.anInt2318;
+			local4 = this.womanHead2;
-			local17 = this.anInt2342;
+			local17 = this.womanHead;
 		}
 		if (local17 == -1) {
 			return null;
 		}
-		@Pc(36) RawModel local36 = Static77.method1686(Static230.aClass153_95, local17);
+		@Pc(36) RawModel local36 = Static77.create(Static230.modelsArchive, local17);
 		if (local4 != -1) {
-			@Pc(44) RawModel local44 = Static77.method1686(Static230.aClass153_95, local4);
+			@Pc(44) RawModel local44 = Static77.create(Static230.modelsArchive, local4);
 			@Pc(55) RawModel[] local55 = new RawModel[] { local36, local44 };
 			local36 = new RawModel(local55, 2);
 		}
 		@Pc(66) int local66;
-		if (this.aShortArray34 != null) {
+		if (this.recolorDestination != null) {
-			for (local66 = 0; local66 < this.aShortArray34.length; local66++) {
+			for (local66 = 0; local66 < this.recolorDestination.length; local66++) {
-				local36.method1687(this.aShortArray34[local66], this.aShortArray33[local66]);
+				local36.recolor(this.recolorDestination[local66], this.recolorSource[local66]);
 			}
 		}
-		if (this.aShortArray32 != null) {
+		if (this.retextureSource != null) {
-			for (local66 = 0; local66 < this.aShortArray32.length; local66++) {
+			for (local66 = 0; local66 < this.retextureSource.length; local66++) {
-				local36.method1669(this.aShortArray32[local66], this.aShortArray31[local66]);
+				local36.retexture(this.retextureSource[local66], this.retextureDestination[local66]);
 			}
 		}
 		return local36;
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(ZI)Lclient!gb;")
-	public final RawModel method1831(@OriginalArg(0) boolean arg0) {
+	public final RawModel getBodyModel(@OriginalArg(0) boolean arg0) {
-		@Pc(4) int local4 = this.anInt2360;
+		@Pc(4) int local4 = this.manWear1;
-		@Pc(18) int local18 = this.anInt2341;
+		@Pc(18) int local18 = this.manWear2;
-		@Pc(21) int local21 = this.anInt2340;
+		@Pc(21) int local21 = this.manWear3;
 		if (arg0) {
-			local21 = this.anInt2344;
+			local21 = this.womanWear3;
-			local4 = this.anInt2331;
+			local4 = this.womanWear1;
-			local18 = this.anInt2361;
+			local18 = this.womanWear2;
 		}
 		if (local4 == -1) {
 			return null;
 		}
-		@Pc(43) RawModel local43 = Static77.method1686(Static230.aClass153_95, local4);
+		@Pc(43) RawModel local43 = Static77.create(Static230.modelsArchive, local4);
 		if (local18 != -1) {
-			@Pc(54) RawModel local54 = Static77.method1686(Static230.aClass153_95, local18);
+			@Pc(54) RawModel local54 = Static77.create(Static230.modelsArchive, local18);
 			if (local21 == -1) {
 				@Pc(68) RawModel[] local68 = new RawModel[] { local43, local54 };
 				local43 = new RawModel(local68, 2);
 			} else {
-				@Pc(81) RawModel local81 = Static77.method1686(Static230.aClass153_95, local21);
+				@Pc(81) RawModel local81 = Static77.create(Static230.modelsArchive, local21);
 				@Pc(96) RawModel[] local96 = new RawModel[] { local43, local54, local81 };
 				local43 = new RawModel(local96, 3);
 			}
 		}
-		if (!arg0 && (this.anInt2330 != 0 || this.anInt2347 != 0 || this.anInt2343 != 0)) {
+		if (!arg0 && (this.manWearXOff != 0 || this.manWearYOff != 0 || this.manWearZOff != 0)) {
-			local43.method1672(this.anInt2330, this.anInt2347, this.anInt2343);
+			local43.translate(this.manWearXOff, this.manWearYOff, this.manWearZOff);
 		}
-		if (arg0 && (this.anInt2346 != 0 || this.anInt2371 != 0 || this.anInt2315 != 0)) {
+		if (arg0 && (this.womanWearXOff != 0 || this.womanWearYOff != 0 || this.womanWearZOff != 0)) {
-			local43.method1672(this.anInt2346, this.anInt2371, this.anInt2315);
+			local43.translate(this.womanWearXOff, this.womanWearYOff, this.womanWearZOff);
 		}
 		@Pc(165) int local165;
-		if (this.aShortArray34 != null) {
+		if (this.recolorDestination != null) {
-			for (local165 = 0; local165 < this.aShortArray34.length; local165++) {
+			for (local165 = 0; local165 < this.recolorDestination.length; local165++) {
-				local43.method1687(this.aShortArray34[local165], this.aShortArray33[local165]);
+				local43.recolor(this.recolorDestination[local165], this.recolorSource[local165]);
 			}
 		}
-		if (this.aShortArray32 != null) {
+		if (this.retextureSource != null) {
-			for (local165 = 0; local165 < this.aShortArray32.length; local165++) {
+			for (local165 = 0; local165 < this.retextureSource.length; local165++) {
-				local43.method1669(this.aShortArray32[local165], this.aShortArray31[local165]);
+				local43.retexture(this.retextureSource[local165], this.retextureDestination[local165]);
 			}
 		}
 		return local43;
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(Lclient!h;Lclient!h;Z)V")
-	public final void method1832(@OriginalArg(0) ObjType arg0, @OriginalArg(1) ObjType arg1) {
+	public final void generateCertificate(@OriginalArg(0) ObjType link, @OriginalArg(1) ObjType template) {
-		this.aClass100_495 = arg0.aClass100_495;
+		this.name = link.name;
-		this.anInt2375 = arg1.anInt2375;
+		this.zoom2d = template.zoom2d;
-		this.aShortArray34 = arg1.aShortArray34;
+		this.recolorDestination = template.recolorDestination;
-		this.aShortArray33 = arg1.aShortArray33;
+		this.recolorSource = template.recolorSource;
-		this.anInt2353 = arg1.anInt2353;
+		this.xAngle2d = template.xAngle2d;
-		this.anInt2369 = arg1.anInt2369;
+		this.yAngle2d = template.yAngle2d;
-		this.aShortArray31 = arg1.aShortArray31;
+		this.retextureDestination = template.retextureDestination;
-		this.anInt2320 = arg1.anInt2320;
+		this.model = template.model;
-		this.aByteArray36 = arg1.aByteArray36;
+		this.recolorDestinationPalette = template.recolorDestinationPalette;
-		this.anInt2339 = arg1.anInt2339;
+		this.zAngle2d = template.zAngle2d;
-		this.anInt2325 = arg0.anInt2325;
+		this.cost = link.cost;
-		this.anInt2336 = 1;
+		this.stackable = 1;
-		this.anInt2319 = arg1.anInt2319;
+		this.yOffset2d = template.yOffset2d;
-		this.anInt2359 = arg1.anInt2359;
+		this.xOffset2d = template.xOffset2d;
-		this.aShortArray32 = arg1.aShortArray32;
+		this.retextureSource = template.retextureSource;
-		this.aBoolean131 = arg0.aBoolean131;
+		this.members = link.members;
 	}
 
 	@OriginalMember(owner = "client!h", name = "d", descriptor = "(I)Lclient!w;")
-	public final SoftwareModel method1834() {
+	public final SoftwareModel getInvModel() {
-		@Pc(11) RawModel local11 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
+		@Pc(11) RawModel local11 = Static77.create(Static230.modelsArchive, this.model);
 		if (local11 == null) {
 			return null;
 		}
 		@Pc(21) int local21;
-		if (this.aShortArray34 != null) {
+		if (this.recolorDestination != null) {
-			for (local21 = 0; local21 < this.aShortArray34.length; local21++) {
+			for (local21 = 0; local21 < this.recolorDestination.length; local21++) {
-				if (this.aByteArray36 == null || local21 >= this.aByteArray36.length) {
+				if (this.recolorDestinationPalette == null || local21 >= this.recolorDestinationPalette.length) {
-					local11.method1687(this.aShortArray34[local21], this.aShortArray33[local21]);
+					local11.recolor(this.recolorDestination[local21], this.recolorSource[local21]);
 				} else {
-					local11.method1687(this.aShortArray34[local21], Static259.aShortArray87[this.aByteArray36[local21] & 0xFF]);
+					local11.recolor(this.recolorDestination[local21], Static259.aShortArray87[this.recolorDestinationPalette[local21] & 0xFF]);
 				}
 			}
 		}
-		if (this.aShortArray32 != null) {
+		if (this.retextureSource != null) {
-			for (local21 = 0; local21 < this.aShortArray32.length; local21++) {
+			for (local21 = 0; local21 < this.retextureSource.length; local21++) {
-				local11.method1669(this.aShortArray32[local21], this.aShortArray31[local21]);
+				local11.retexture(this.retextureSource[local21], this.retextureDestination[local21]);
 			}
 		}
-		@Pc(107) SoftwareModel local107 = local11.method1671(this.anInt2352 + 64, 768 - -this.anInt2357);
+		@Pc(107) SoftwareModel local107 = local11.createSoftwareModel(this.ambient + 64, 768 - -this.contrast);
-		if (this.anInt2373 != 128 || this.anInt2350 != 128 || this.anInt2368 != 128) {
+		if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-			local107.method4559(this.anInt2373, this.anInt2350, this.anInt2368);
+			local107.resize(this.resizeX, this.resizeY, this.resizeZ);
 		}
 		return local107;
 	}

client/src/main/java/ParamType.java

@@ -7,38 +7,38 @@ import org.openrs2.deob.annotation.Pc;
 public final class ParamType extends SecondaryNode {
 
 	@OriginalMember(owner = "client!hn", name = "I", descriptor = "I")
-	public int anInt2667;
+	public int defaultInt;
 
 	@OriginalMember(owner = "client!hn", name = "L", descriptor = "I")
-	private int anInt2669;
+	private int type;
 
 	@OriginalMember(owner = "client!hn", name = "Q", descriptor = "Lclient!na;")
-	public JagString aClass100_544;
+	public JagString defaultString;
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(ILclient!wa;I)V")
-	private void method2072(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
+	private void decode(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 1) {
-			this.anInt2669 = arg1.g1();
+			this.type = arg1.g1();
 		} else if (arg0 == 2) {
-			this.anInt2667 = arg1.g4();
+			this.defaultInt = arg1.g4();
 		} else if (arg0 == 5) {
-			this.aClass100_544 = arg1.gjstr();
+			this.defaultString = arg1.gjstr();
 		}
 	}
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method2076(@OriginalArg(1) Buffer arg0) {
+	public final void decode(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(13) int local13 = arg0.g1();
 			if (local13 == 0) {
 				return;
 			}
-			this.method2072(local13, arg0);
+			this.decode(local13, arg0);
 		}
 	}
 
 	@OriginalMember(owner = "client!hn", name = "f", descriptor = "(I)Z")
-	public final boolean method2078() {
+	public final boolean isString() {
-		return this.anInt2669 == 115;
+		return this.type == 115;
 	}
 }

client/src/main/java/PathingEntity.java

@@ -265,7 +265,7 @@ public abstract class PathingEntity extends Entity {
 
 	@OriginalMember(owner = "client!fe", name = "a", descriptor = "(IIIIZ)V")
 	public final void method2683(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) {
-		if (this.anInt3369 != -1 && Static36.method941(this.anInt3369).anInt5349 == 1) {
+		if (this.anInt3369 != -1 && Static36.get(this.anInt3369).anInt5349 == 1) {
 			this.anInt3369 = -1;
 		}
 		if (!arg3) {
@@ -306,7 +306,7 @@ public abstract class PathingEntity extends Entity {
 			local10--;
 			local15++;
 		}
-		if (this.anInt3369 != -1 && Static36.method941(this.anInt3369).anInt5349 == 1) {
+		if (this.anInt3369 != -1 && Static36.get(this.anInt3369).anInt5349 == 1) {
 			this.anInt3369 = -1;
 		}
 		if (this.movementQueueSize < 9) {

client/src/main/java/Player.java

@@ -57,7 +57,7 @@ public final class Player extends PathingEntity {
 	@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
 	@Override
 	public final int getSize() {
-		return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.getSize() : Static214.method4363(this.aClass59_1.anInt2492).anInt3713;
+		return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.getSize() : Static214.get(this.aClass59_1.anInt2492).soze;
 	}
 
 	@OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I")
@@ -101,7 +101,7 @@ public final class Player extends PathingEntity {
 				if (local134 >= 32768) {
 					local134 = Static234.anIntArray455[local134 - 32768];
 					local44[local102] = local134 | 0x40000000;
-					local175 = Static71.method1439(local134).anInt2351;
+					local175 = Static71.get(local134).team;
 					if (local175 != 0) {
 						this.anInt1650 = local175;
 					}
@@ -171,8 +171,8 @@ public final class Player extends PathingEntity {
 		if (this.aClass59_1 == null) {
 			return;
 		}
-		@Pc(25) SeqType local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
+		@Pc(25) SeqType local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.get(this.anInt3369) : null;
-		@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : Static36.method941(this.anInt3366);
+		@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : Static36.get(this.anInt3366);
 		@Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
 		@Pc(79) int local79 = Static198.method1029();
 		if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) {
@@ -195,7 +195,7 @@ public final class Player extends PathingEntity {
 		}
 		this.anInt3413 = local76.method4549();
 		@Pc(184) Model local184;
-		if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) {
+		if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.get(this.aClass59_1.anInt2492).shadow)) {
 			local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
 			if (GlRenderer.enabled) {
 				@Pc(188) float local188 = GlRenderer.method4179();

client/src/main/java/PlayerAppearance.java

@@ -37,32 +37,32 @@ public final class PlayerAppearance {
 		if (local30 == null) {
 			@Pc(36) RawModel[] local36 = new RawModel[3];
 			@Pc(38) int local38 = 0;
-			if (!Static81.method1752(arg2).method1205() || !Static81.method1752(arg6).method1205() || !Static81.method1752(arg1).method1205()) {
+			if (!Static81.method1752(arg2).isHeadModelReady() || !Static81.method1752(arg6).isHeadModelReady() || !Static81.method1752(arg1).isHeadModelReady()) {
 				return null;
 			}
-			@Pc(66) RawModel local66 = Static81.method1752(arg2).method1198();
+			@Pc(66) RawModel local66 = Static81.method1752(arg2).getHeadModel();
 			if (local66 != null) {
 				local38++;
 				local36[0] = local66;
 			}
-			local66 = Static81.method1752(arg6).method1198();
+			local66 = Static81.method1752(arg6).getHeadModel();
 			if (local66 != null) {
 				local36[local38++] = local66;
 			}
-			local66 = Static81.method1752(arg1).method1198();
+			local66 = Static81.method1752(arg1).getHeadModel();
 			if (local66 != null) {
 				local36[local38++] = local66;
 			}
 			local66 = new RawModel(local36, local38);
 			for (@Pc(110) int local110 = 0; local110 < 5; local110++) {
 				if (this.anIntArray236[local110] < Static33.aShortArrayArray2[local110].length) {
-					local66.method1687(Static200.aShortArray65[local110], Static33.aShortArrayArray2[local110][this.anIntArray236[local110]]);
+					local66.recolor(Static200.aShortArray65[local110], Static33.aShortArrayArray2[local110][this.anIntArray236[local110]]);
 				}
 				if (Static172.aShortArrayArray7[local110].length > this.anIntArray236[local110]) {
-					local66.method1687(Static160.aShortArray41[local110], Static172.aShortArrayArray7[local110][this.anIntArray236[local110]]);
+					local66.recolor(Static160.aShortArray41[local110], Static172.aShortArrayArray7[local110][this.anIntArray236[local110]]);
 				}
 			}
-			local30 = local66.method1679(64, 768, -50, -10, -50);
+			local30 = local66.createModel(64, 768, -50, -10, -50);
 			Static139.aClass99_21.put(local30, local24);
 		}
 		if (arg4 != null) {
@@ -111,7 +111,7 @@ public final class PlayerAppearance {
 			for (@Pc(24) int local24 = 0; local24 < 8; local24++) {
 				for (@Pc(31) int local31 = 0; local31 < Static53.anInt1716; local31++) {
 					@Pc(38) IdkType local38 = Static81.method1752(local31);
-					if (local38 != null && !local38.aBoolean85 && local38.anInt1457 == (arg2 ? Static153.anIntArray351[local24] : Static204.anIntArray425[local24])) {
+					if (local38 != null && !local38.aBoolean85 && local38.feature == (arg2 ? Static153.anIntArray351[local24] : Static204.anIntArray425[local24])) {
 						arg3[Static272.anIntArray451[local24]] = Integer.MIN_VALUE | local31;
 						break;
 					}
@@ -133,7 +133,7 @@ public final class PlayerAppearance {
 
 	@OriginalMember(owner = "client!hh", name = "b", descriptor = "(I)I")
 	public final int method1952() {
-		return this.anInt2492 == -1 ? (this.anIntArray233[8] << 10) + ((this.anIntArray236[0] << 25) + (this.anIntArray236[4] << 20)) + (this.anIntArray233[0] << 15) + (this.anIntArray233[11] << 5) + this.anIntArray233[1] : Static214.method4363(this.anInt2492).anInt3741 + 305419896;
+		return this.anInt2492 == -1 ? (this.anIntArray233[8] << 10) + ((this.anIntArray236[0] << 25) + (this.anIntArray236[4] << 20)) + (this.anIntArray233[0] << 15) + (this.anIntArray233[11] << 5) + this.anIntArray233[1] : Static214.get(this.anInt2492).id + 305419896;
 	}
 
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(III)V")
@@ -148,7 +148,7 @@ public final class PlayerAppearance {
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "([Lclient!ub;ILclient!tk;Lclient!tk;IIIIZII)Lclient!ak;")
 	public final Model method1954(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) SeqType arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(9) int arg7, @OriginalArg(10) int arg8) {
 		if (this.anInt2492 != -1) {
-			return Static214.method4363(this.anInt2492).method2937(arg0, arg5, arg8, arg1, arg6, arg7, arg2, arg4, arg3);
+			return Static214.get(this.anInt2492).getBodyModel(arg0, arg5, arg8, arg1, arg6, arg7, arg2, arg4, arg3);
 		}
 		@Pc(38) int[] local38 = this.anIntArray233;
 		@Pc(41) long local41 = this.aLong88;
@@ -195,10 +195,10 @@ public final class PlayerAppearance {
 			for (@Pc(160) int local160 = 0; local160 < 12; local160++) {
 				local169 = local38[local160];
 				if ((local169 & 0x40000000) == 0) {
-					if ((local169 & Integer.MIN_VALUE) != 0 && !Static81.method1752(local169 & 0x3FFFFFFF).method1199()) {
+					if ((local169 & Integer.MIN_VALUE) != 0 && !Static81.method1752(local169 & 0x3FFFFFFF).isBodyModelReady()) {
 						local158 = true;
 					}
-				} else if (!Static71.method1439(local169 & 0x3FFFFFFF).method1822(this.aBoolean141)) {
+				} else if (!Static71.get(local169 & 0x3FFFFFFF).method1822(this.aBoolean141)) {
 					local158 = true;
 				}
 			}
@@ -217,12 +217,12 @@ public final class PlayerAppearance {
 					local250 = local38[local169];
 					@Pc(272) RawModel local272;
 					if ((local250 & 0x40000000) != 0) {
-						local272 = Static71.method1439(local250 & 0x3FFFFFFF).method1831(this.aBoolean141);
+						local272 = Static71.get(local250 & 0x3FFFFFFF).getBodyModel(this.aBoolean141);
 						if (local272 != null) {
 							local239[local169] = local272;
 						}
 					} else if ((Integer.MIN_VALUE & local250) != 0) {
-						local272 = Static81.method1752(local250 & 0x3FFFFFFF).method1204();
+						local272 = Static81.method1752(local250 & 0x3FFFFFFF).getBodyModel();
 						if (local272 != null) {
 							local239[local169] = local272;
 						}
@@ -281,7 +281,7 @@ public final class PlayerAppearance {
 								local239[local250].method1684(local374, local367, local381);
 							}
 							if (local346 != 0 || local353 != 0 || local360 != 0) {
-								local239[local250].method1672(local346, local353, local360);
+								local239[local250].translate(local346, local353, local360);
 							}
 						}
 					}
@@ -289,13 +289,13 @@ public final class PlayerAppearance {
 				@Pc(740) RawModel local740 = new RawModel(local239, local239.length);
 				for (local346 = 0; local346 < 5; local346++) {
 					if (Static33.aShortArrayArray2[local346].length > this.anIntArray236[local346]) {
-						local740.method1687(Static200.aShortArray65[local346], Static33.aShortArrayArray2[local346][this.anIntArray236[local346]]);
+						local740.recolor(Static200.aShortArray65[local346], Static33.aShortArrayArray2[local346][this.anIntArray236[local346]]);
 					}
 					if (Static172.aShortArrayArray7[local346].length > this.anIntArray236[local346]) {
-						local740.method1687(Static160.aShortArray41[local346], Static172.aShortArrayArray7[local346][this.anIntArray236[local346]]);
+						local740.recolor(Static160.aShortArray41[local346], Static172.aShortArrayArray7[local346][this.anIntArray236[local346]]);
 					}
 				}
-				local154 = local740.method1679(64, 850, -30, -50, -30);
+				local154 = local740.createModel(64, 850, -30, -50, -30);
 				if (GlRenderer.enabled) {
 					((GlModel) local154).method4111(false, false, true, false, false, true);
 				}
@@ -311,14 +311,14 @@ public final class PlayerAppearance {
 		@Pc(979) int local979;
 		for (local353 = 0; local353 < local346; local353++) {
 			if (arg0[local353] != null) {
-				@Pc(858) SeqType local858 = Static36.method941(arg0[local353].anInt5396);
+				@Pc(858) SeqType local858 = Static36.get(arg0[local353].anInt5396);
-				if (local858.anIntArray473 != null) {
+				if (local858.frames != null) {
 					local158 = true;
 					Static208.aClass144Array2[local353] = local858;
 					local374 = arg0[local353].anInt5399;
 					local367 = arg0[local353].anInt5398;
-					local381 = local858.anIntArray473[local374];
+					local381 = local858.frames[local374];
-					Static276.aClass3_Sub2_Sub7Array8[local353] = Static72.method1566(local381 >>> 16);
+					Static276.aClass3_Sub2_Sub7Array8[local353] = Static72.getAnimFrameset(local381 >>> 16);
 					local381 &= 0xFFFF;
 					Static241.anIntArray520[local353] = local381;
 					if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) {
@@ -326,11 +326,11 @@ public final class PlayerAppearance {
 						local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
 						local838 |= local858.aBoolean278;
 					}
-					if ((local858.aBoolean277 || Static204.applyTweening) && local367 != -1 && local367 < local858.anIntArray473.length) {
+					if ((local858.tween || Static204.applyTweening) && local367 != -1 && local367 < local858.frames.length) {
 						Static262.anIntArray515[local353] = local858.anIntArray474[local374];
 						Static73.anIntArray183[local353] = arg0[local353].anInt5404;
-						local979 = local858.anIntArray473[local367];
+						local979 = local858.frames[local367];
-						Static133.aClass3_Sub2_Sub7Array7[local353] = Static72.method1566(local979 >>> 16);
+						Static133.aClass3_Sub2_Sub7Array7[local353] = Static72.getAnimFrameset(local979 >>> 16);
 						@Pc(991) int local991 = local979 & 0xFFFF;
 						Static216.anIntArray187[local353] = local991;
 						if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) {
@@ -355,24 +355,24 @@ public final class PlayerAppearance {
 		@Pc(1040) AnimFrameset local1040 = null;
 		@Pc(1042) AnimFrameset local1042 = null;
 		if (arg3 != null) {
-			local353 = arg3.anIntArray473[arg7];
+			local353 = arg3.frames[arg7];
 			local979 = local353 >>> 16;
-			local1042 = Static72.method1566(local979);
+			local1042 = Static72.getAnimFrameset(local979);
 			local353 &= 0xFFFF;
 			if (local1042 != null) {
 				local836 |= local1042.isColorTransformed(local353);
 				local827 |= local1042.isAlphaTransformed(local353);
 				local838 |= arg3.aBoolean278;
 			}
-			if ((arg3.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg3.anIntArray473.length > arg1) {
+			if ((arg3.tween || Static204.applyTweening) && arg1 != -1 && arg3.frames.length > arg1) {
-				local360 = arg3.anIntArray473[arg1];
+				local360 = arg3.frames[arg1];
 				local451 = local360 >>> 16;
 				local360 &= 0xFFFF;
 				local374 = arg3.anIntArray474[arg7];
 				if (local979 == local451) {
 					local1040 = local1042;
 				} else {
-					local1040 = Static72.method1566(local360 >>> 16);
+					local1040 = Static72.getAnimFrameset(local360 >>> 16);
 				}
 				if (local1040 != null) {
 					local836 |= local1040.isColorTransformed(local360);
@@ -386,24 +386,24 @@ public final class PlayerAppearance {
 		@Pc(1156) AnimFrameset local1156 = null;
 		local457 = 0;
 		if (arg2 != null) {
-			local979 = arg2.anIntArray473[arg8];
+			local979 = arg2.frames[arg8];
 			local475 = local979 >>> 16;
 			local979 &= 0xFFFF;
-			local1154 = Static72.method1566(local475);
+			local1154 = Static72.getAnimFrameset(local475);
 			if (local1154 != null) {
 				local836 |= local1154.isColorTransformed(local979);
 				local827 |= local1154.isAlphaTransformed(local979);
 				local838 |= arg2.aBoolean278;
 			}
-			if ((arg2.aBoolean277 || Static204.applyTweening) && arg5 != -1 && arg2.anIntArray473.length > arg5) {
+			if ((arg2.tween || Static204.applyTweening) && arg5 != -1 && arg2.frames.length > arg5) {
 				local457 = arg2.anIntArray474[arg8];
-				local451 = arg2.anIntArray473[arg5];
+				local451 = arg2.frames[arg5];
 				local481 = local451 >>> 16;
 				local451 &= 0xFFFF;
 				if (local475 == local481) {
 					local1156 = local1154;
 				} else {
-					local1156 = Static72.method1566(local451 >>> 16);
+					local1156 = Static72.getAnimFrameset(local451 >>> 16);
 				}
 				if (local1156 != null) {
 					local836 |= local1156.isColorTransformed(local451);
@@ -439,7 +439,7 @@ public final class PlayerAppearance {
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IBLclient!tk;II)Lclient!ak;")
 	public final Model method1956(@OriginalArg(0) int arg0, @OriginalArg(2) SeqType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		if (this.anInt2492 != -1) {
-			return Static214.method4363(this.anInt2492).method2943(arg1, arg0, arg3, arg2);
+			return Static214.get(this.anInt2492).getHeadModel(arg1, arg0, arg3, arg2);
 		}
 		@Pc(30) Model local30 = (Model) Static139.aClass99_21.get(this.aLong88);
 		if (local30 == null) {
@@ -448,10 +448,10 @@ public final class PlayerAppearance {
 			for (@Pc(44) int local44 = 0; local44 < 12; local44++) {
 				local52 = this.anIntArray233[local44];
 				if ((local52 & 0x40000000) == 0) {
-					if ((local52 & Integer.MIN_VALUE) != 0 && !Static81.method1752(local52 & 0x3FFFFFFF).method1205()) {
+					if ((local52 & Integer.MIN_VALUE) != 0 && !Static81.method1752(local52 & 0x3FFFFFFF).isHeadModelReady()) {
 						local42 = true;
 					}
-				} else if (!Static71.method1439(local52 & 0x3FFFFFFF).method1816(this.aBoolean141)) {
+				} else if (!Static71.get(local52 & 0x3FFFFFFF).method1816(this.aBoolean141)) {
 					local42 = true;
 				}
 			}
@@ -465,12 +465,12 @@ public final class PlayerAppearance {
 				local114 = this.anIntArray233[local104];
 				@Pc(134) RawModel local134;
 				if ((local114 & 0x40000000) != 0) {
-					local134 = Static71.method1439(local114 & 0x3FFFFFFF).method1830(this.aBoolean141);
+					local134 = Static71.get(local114 & 0x3FFFFFFF).getHeadModel(this.aBoolean141);
 					if (local134 != null) {
 						local100[local52++] = local134;
 					}
 				} else if ((Integer.MIN_VALUE & local114) != 0) {
-					local134 = Static81.method1752(local114 & 0x3FFFFFFF).method1198();
+					local134 = Static81.method1752(local114 & 0x3FFFFFFF).getHeadModel();
 					if (local134 != null) {
 						local100[local52++] = local134;
 					}
@@ -479,13 +479,13 @@ public final class PlayerAppearance {
 			@Pc(171) RawModel local171 = new RawModel(local100, local52);
 			for (local114 = 0; local114 < 5; local114++) {
 				if (Static33.aShortArrayArray2[local114].length > this.anIntArray236[local114]) {
-					local171.method1687(Static200.aShortArray65[local114], Static33.aShortArrayArray2[local114][this.anIntArray236[local114]]);
+					local171.recolor(Static200.aShortArray65[local114], Static33.aShortArrayArray2[local114][this.anIntArray236[local114]]);
 				}
 				if (Static172.aShortArrayArray7[local114].length > this.anIntArray236[local114]) {
-					local171.method1687(Static160.aShortArray41[local114], Static172.aShortArrayArray7[local114][this.anIntArray236[local114]]);
+					local171.recolor(Static160.aShortArray41[local114], Static172.aShortArrayArray7[local114][this.anIntArray236[local114]]);
 				}
 			}
-			local30 = local171.method1679(64, 768, -50, -10, -50);
+			local30 = local171.createModel(64, 768, -50, -10, -50);
 			Static139.aClass99_21.put(local30, this.aLong88);
 		}
 		if (arg1 != null) {

client/src/main/java/ProjAnim.java

@@ -104,11 +104,11 @@ public final class ProjAnim extends Entity {
 		this.anInt4797 = arg8;
 		this.anInt4822 = arg5;
 		this.anInt4813 = arg4;
-		@Pc(58) int local58 = Static34.method877(this.anInt4816).anInt1754;
+		@Pc(58) int local58 = Static34.method877(this.anInt4816).seqId;
 		if (local58 == -1) {
 			this.aClass144_3 = null;
 		} else {
-			this.aClass144_3 = Static36.method941(local58);
+			this.aClass144_3 = Static36.get(local58);
 		}
 	}
 
@@ -154,16 +154,16 @@ public final class ProjAnim extends Entity {
 					}
 					this.anInt4796 -= this.aClass144_3.anIntArray474[this.anInt4820];
 					this.anInt4820++;
-					if (this.anInt4820 >= this.aClass144_3.anIntArray473.length) {
+					if (this.anInt4820 >= this.aClass144_3.frames.length) {
 						this.anInt4820 -= this.aClass144_3.anInt5362;
-						if (this.anInt4820 < 0 || this.aClass144_3.anIntArray473.length <= this.anInt4820) {
+						if (this.anInt4820 < 0 || this.aClass144_3.frames.length <= this.anInt4820) {
 							this.anInt4820 = 0;
 						}
 					}
 					this.anInt4798 = this.anInt4820 + 1;
-				} while (this.aClass144_3.anIntArray473.length > this.anInt4798);
+				} while (this.aClass144_3.frames.length > this.anInt4798);
 				this.anInt4798 -= this.aClass144_3.anInt5362;
-			} while (this.anInt4798 >= 0 && this.anInt4798 < this.aClass144_3.anIntArray473.length);
+			} while (this.anInt4798 >= 0 && this.anInt4798 < this.aClass144_3.frames.length);
 			this.anInt4798 = -1;
 		}
 	}

client/src/main/java/RawModel.java

@@ -481,7 +481,7 @@ public final class RawModel extends Entity {
 	@OriginalMember(owner = "client!gb", name = "a", descriptor = "(III)Lclient!th;")
 	@Override
 	public final Entity method4539() {
-		return this.method1679(this.aShort19, this.aShort18, -50, -10, -50);
+		return this.createModel(this.aShort19, this.aShort18, -50, -10, -50);
 	}
 
 	@OriginalMember(owner = "client!gb", name = "a", descriptor = "(Lclient!gb;IS)I")
@@ -541,7 +541,7 @@ public final class RawModel extends Entity {
 		}
 		local149 = (local149 >> 1) - arg2;
 		if (local149 != 0) {
-			this.method1672(0, local149, 0);
+			this.translate(0, local149, 0);
 		}
 	}
 
@@ -619,7 +619,7 @@ public final class RawModel extends Entity {
 	}
 
 	@OriginalMember(owner = "client!gb", name = "a", descriptor = "(SS)V")
-	public final void method1669(@OriginalArg(0) short arg0, @OriginalArg(1) short arg1) {
+	public final void retexture(@OriginalArg(0) short arg0, @OriginalArg(1) short arg1) {
 		if (this.aShortArray23 == null) {
 			return;
 		}
@@ -786,7 +786,7 @@ public final class RawModel extends Entity {
 	}
 
 	@OriginalMember(owner = "client!gb", name = "b", descriptor = "(IIIII)Lclient!w;")
-	public final SoftwareModel method1671(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final SoftwareModel createSoftwareModel(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		return new SoftwareModel(this, arg0, arg1, -50, -10, -50);
 	}
 
@@ -796,7 +796,7 @@ public final class RawModel extends Entity {
 	}
 
 	@OriginalMember(owner = "client!gb", name = "c", descriptor = "(III)V")
-	public final void method1672(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final void translate(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		for (@Pc(1) int local1 = 0; local1 < this.anInt2139; local1++) {
 			this.anIntArray202[local1] += arg0;
 			this.anIntArray201[local1] += arg1;
@@ -1230,7 +1230,7 @@ public final class RawModel extends Entity {
 	}
 
 	@OriginalMember(owner = "client!gb", name = "c", descriptor = "(IIIII)Lclient!ak;")
-	public final Model method1679(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public final Model createModel(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (GlRenderer.enabled) {
 			@Pc(9) GlModel local9 = new GlModel(this, arg0, arg1, true);
 			local9.method4099();
@@ -1449,7 +1449,7 @@ public final class RawModel extends Entity {
 	}
 
 	@OriginalMember(owner = "client!gb", name = "b", descriptor = "(SS)V")
-	public final void method1687(@OriginalArg(0) short arg0, @OriginalArg(1) short arg1) {
+	public final void recolor(@OriginalArg(0) short arg0, @OriginalArg(1) short arg1) {
 		for (@Pc(1) int local1 = 0; local1 < this.anInt2136; local1++) {
 			if (this.aShortArray24[local1] == arg0) {
 				this.aShortArray24[local1] = arg1;

client/src/main/java/SeqType.java

@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class SeqType {
 
 	@OriginalMember(owner = "client!tk", name = "g", descriptor = "[I")
-	public int[] anIntArray473;
+	public int[] frames;
 
 	@OriginalMember(owner = "client!tk", name = "n", descriptor = "[Z")
 	public boolean[] aBooleanArray123;
@@ -28,7 +28,7 @@ public final class SeqType {
 	public int anInt5347 = 2;
 
 	@OriginalMember(owner = "client!tk", name = "b", descriptor = "Z")
-	public boolean aBoolean277 = false;
+	public boolean tween = false;
 
 	@OriginalMember(owner = "client!tk", name = "f", descriptor = "I")
 	public int anInt5349 = -1;
@@ -61,30 +61,30 @@ public final class SeqType {
 	public boolean aBoolean280 = false;
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!wa;B)V")
-	public final void method4213(@OriginalArg(0) Buffer arg0) {
+	public final void decode(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(19) int local19 = arg0.g1();
 			if (local19 == 0) {
 				return;
 			}
-			this.method4220(local19, arg0);
+			this.decode(local19, arg0);
 		}
 	}
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(IIILclient!ak;II)Lclient!ak;")
 	public final Model method4214(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Model arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(10) int local10 = this.anIntArray474[arg0];
-		@Pc(15) int local15 = this.anIntArray473[arg0];
+		@Pc(15) int local15 = this.frames[arg0];
-		@Pc(23) AnimFrameset local23 = Static72.method1566(local15 >> 16);
+		@Pc(23) AnimFrameset local23 = Static72.getAnimFrameset(local15 >> 16);
 		@Pc(27) int local27 = local15 & 0xFFFF;
 		if (local23 == null) {
 			return arg2.method4568(true, true, true);
 		}
 		@Pc(39) int local39 = arg3 & 0x3;
 		@Pc(41) AnimFrameset local41 = null;
-		if ((this.aBoolean277 || Static204.applyTweening) && arg1 != -1 && this.anIntArray473.length > arg1) {
+		if ((this.tween || Static204.applyTweening) && arg1 != -1 && this.frames.length > arg1) {
-			@Pc(69) int local69 = this.anIntArray473[arg1];
+			@Pc(69) int local69 = this.frames[arg1];
-			local41 = Static72.method1566(local69 >> 16);
+			local41 = Static72.getAnimFrameset(local69 >> 16);
 			arg1 = local69 & 0xFFFF;
 		}
 		@Pc(124) Model local124;
@@ -129,17 +129,17 @@ public final class SeqType {
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!ak;BIII)Lclient!ak;")
 	public final Model method4215(@OriginalArg(0) Model arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
-		@Pc(8) int local8 = this.anIntArray473[arg3];
+		@Pc(8) int local8 = this.frames[arg3];
 		@Pc(13) int local13 = this.anIntArray474[arg3];
-		@Pc(19) AnimFrameset local19 = Static72.method1566(local8 >> 16);
+		@Pc(19) AnimFrameset local19 = Static72.getAnimFrameset(local8 >> 16);
 		@Pc(23) int local23 = local8 & 0xFFFF;
 		if (local19 == null) {
 			return arg0.method4572(true, true, true);
 		}
 		@Pc(34) AnimFrameset local34 = null;
-		if ((this.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg1 < this.anIntArray473.length) {
+		if ((this.tween || Static204.applyTweening) && arg1 != -1 && arg1 < this.frames.length) {
-			@Pc(59) int local59 = this.anIntArray473[arg1];
+			@Pc(59) int local59 = this.frames[arg1];
-			local34 = Static72.method1566(local59 >> 16);
+			local34 = Static72.getAnimFrameset(local59 >> 16);
 			arg1 = local59 & 0xFFFF;
 		}
 		@Pc(71) AnimFrameset local71 = null;
@@ -150,14 +150,14 @@ public final class SeqType {
 			if (this.anIntArray475.length > arg3) {
 				local83 = this.anIntArray475[arg3];
 				if (local83 != 65535) {
-					local71 = Static72.method1566(local83 >> 16);
+					local71 = Static72.getAnimFrameset(local83 >> 16);
 					local83 &= 0xFFFF;
 				}
 			}
-			if ((this.aBoolean277 || Static204.applyTweening) && arg1 != -1 && this.anIntArray475.length > arg1) {
+			if ((this.tween || Static204.applyTweening) && arg1 != -1 && this.anIntArray475.length > arg1) {
 				local85 = this.anIntArray475[arg1];
 				if (local85 != 65535) {
-					local81 = Static72.method1566(local85 >> 16);
+					local81 = Static72.getAnimFrameset(local85 >> 16);
 					local85 &= 0xFFFF;
 				}
 			}
@@ -187,17 +187,17 @@ public final class SeqType {
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(IIIILclient!ak;I)Lclient!ak;")
 	public final Model method4216(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Model arg4) {
 		@Pc(6) int local6 = this.anIntArray474[arg1];
-		@Pc(11) int local11 = this.anIntArray473[arg1];
+		@Pc(11) int local11 = this.frames[arg1];
-		@Pc(19) AnimFrameset local19 = Static72.method1566(local11 >> 16);
+		@Pc(19) AnimFrameset local19 = Static72.getAnimFrameset(local11 >> 16);
 		@Pc(27) int local27 = local11 & 0xFFFF;
 		if (local19 == null) {
 			return arg4.method4572(true, true, true);
 		}
 		@Pc(40) int local40 = arg3 & 0x3;
 		@Pc(42) AnimFrameset local42 = null;
-		if ((this.aBoolean277 || Static204.applyTweening) && arg0 != -1 && arg0 < this.anIntArray473.length) {
+		if ((this.tween || Static204.applyTweening) && arg0 != -1 && arg0 < this.frames.length) {
-			@Pc(66) int local66 = this.anIntArray473[arg0];
+			@Pc(66) int local66 = this.frames[arg0];
-			local42 = Static72.method1566(local66 >> 16);
+			local42 = Static72.getAnimFrameset(local66 >> 16);
 			arg0 = local66 & 0xFFFF;
 		}
 		@Pc(106) Model local106;
@@ -241,7 +241,7 @@ public final class SeqType {
 	}
 
 	@OriginalMember(owner = "client!tk", name = "b", descriptor = "(B)V")
-	public final void method4218() {
+	public final void postDecode() {
 		if (this.anInt5363 == -1) {
 			if (this.aBooleanArray123 == null) {
 				this.anInt5363 = 0;
@@ -262,16 +262,16 @@ public final class SeqType {
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(IIIBLclient!ak;)Lclient!ak;")
 	public final Model method4219(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) Model arg3) {
 		@Pc(16) int local16 = this.anIntArray474[arg2];
-		@Pc(21) int local21 = this.anIntArray473[arg2];
+		@Pc(21) int local21 = this.frames[arg2];
-		@Pc(27) AnimFrameset local27 = Static72.method1566(local21 >> 16);
+		@Pc(27) AnimFrameset local27 = Static72.getAnimFrameset(local21 >> 16);
 		@Pc(31) int local31 = local21 & 0xFFFF;
 		if (local27 == null) {
 			return arg3.method4560(true, true, true);
 		}
 		@Pc(42) AnimFrameset local42 = null;
-		if ((this.aBoolean277 || Static204.applyTweening) && arg0 != -1 && this.anIntArray473.length > arg0) {
+		if ((this.tween || Static204.applyTweening) && arg0 != -1 && this.frames.length > arg0) {
-			@Pc(65) int local65 = this.anIntArray473[arg0];
+			@Pc(65) int local65 = this.frames[arg0];
-			local42 = Static72.method1566(local65 >> 16);
+			local42 = Static72.getAnimFrameset(local65 >> 16);
 			arg0 = local65 & 0xFFFF;
 		}
 		@Pc(103) Model local103;
@@ -285,7 +285,7 @@ public final class SeqType {
 	}
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(IBLclient!wa;)V")
-	private void method4220(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) {
+	private void decode(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) {
 		@Pc(8) int local8;
 		@Pc(14) int local14;
 		if (arg0 == 1) {
@@ -294,12 +294,12 @@ public final class SeqType {
 			for (local14 = 0; local14 < local8; local14++) {
 				this.anIntArray474[local14] = arg1.g2();
 			}
-			this.anIntArray473 = new int[local8];
+			this.frames = new int[local8];
 			for (local14 = 0; local14 < local8; local14++) {
-				this.anIntArray473[local14] = arg1.g2();
+				this.frames[local14] = arg1.g2();
 			}
 			for (local14 = 0; local14 < local8; local14++) {
-				this.anIntArray473[local14] += arg1.g2() << 16;
+				this.frames[local14] += arg1.g2() << 16;
 			}
 		} else if (arg0 == 2) {
 			this.anInt5362 = arg1.g2();
@@ -350,7 +350,7 @@ public final class SeqType {
 		} else if (arg0 == 14) {
 			this.aBoolean278 = true;
 		} else if (arg0 == 15) {
-			this.aBoolean277 = true;
+			this.tween = true;
 		} else if (arg0 == 16) {
 			this.aBoolean280 = true;
 		}

client/src/main/java/SoftwareIndexedSprite.java

@@ -15,11 +15,11 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(IIIIII[B[I)V")
 	public SoftwareIndexedSprite(@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) byte[] arg6, @OriginalArg(7) int[] arg7) {
 		this.innerWidth = arg0;
-		this.anInt4276 = arg1;
+		this.innerHeight = arg1;
 		this.anInt4280 = arg2;
 		this.anInt4273 = arg3;
 		this.width = arg4;
-		this.anInt4278 = arg5;
+		this.height = arg5;
 		this.aByteArray18 = arg6;
 		this.anIntArray144 = arg7;
 	}
@@ -27,14 +27,14 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(III)V")
 	public SoftwareIndexedSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		this.innerWidth = this.width = arg0;
-		this.anInt4276 = this.anInt4278 = arg1;
+		this.innerHeight = this.height = arg1;
 		this.anInt4280 = this.anInt4273 = 0;
 		this.aByteArray18 = new byte[arg0 * arg1];
 		this.anIntArray144 = new int[arg2];
 	}
 
 	@OriginalMember(owner = "client!ek", name = "b", descriptor = "(III)V")
-	public final void method1389(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final void adjustPalette(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		for (@Pc(1) int local1 = 0; local1 < this.anIntArray144.length; local1++) {
 			@Pc(15) int local15 = this.anIntArray144[local1] >> 16 & 0xFF;
 			local15 += arg0;
@@ -64,11 +64,11 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!ek", name = "a", descriptor = "(IIIII)V")
 	public final void method1390(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		@Pc(2) int local2 = this.width;
-		@Pc(5) int local5 = this.anInt4278;
+		@Pc(5) int local5 = this.height;
 		@Pc(7) int local7 = 0;
 		@Pc(9) int local9 = 0;
 		@Pc(12) int local12 = this.innerWidth;
-		@Pc(15) int local15 = this.anInt4276;
+		@Pc(15) int local15 = this.innerHeight;
 		@Pc(21) int local21 = (local12 << 16) / arg2;
 		@Pc(27) int local27 = (local15 << 16) / arg3;
 		@Pc(41) int local41;
@@ -136,24 +136,24 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 	}
 
 	@OriginalMember(owner = "client!ek", name = "b", descriptor = "()V")
-	public final void method1395() {
+	public final void flipVertical() {
-		@Pc(6) byte[] local6 = new byte[this.width * this.anInt4278];
+		@Pc(6) byte[] local6 = new byte[this.width * this.height];
 		@Pc(8) int local8 = 0;
 		@Pc(10) int local10;
 		for (local10 = 0; local10 < this.width; local10++) {
-			for (@Pc(19) int local19 = this.anInt4278 - 1; local19 >= 0; local19--) {
+			for (@Pc(19) int local19 = this.height - 1; local19 >= 0; local19--) {
 				local6[local8++] = this.aByteArray18[local10 + local19 * this.width];
 			}
 		}
 		this.aByteArray18 = local6;
 		local10 = this.anInt4273;
 		this.anInt4273 = this.anInt4280;
-		this.anInt4280 = this.anInt4276 - this.anInt4278 - local10;
+		this.anInt4280 = this.innerHeight - this.height - local10;
-		local10 = this.anInt4278;
+		local10 = this.height;
-		this.anInt4278 = this.width;
+		this.height = this.width;
 		this.width = local10;
-		local10 = this.anInt4276;
+		local10 = this.innerHeight;
-		this.anInt4276 = this.innerWidth;
+		this.innerHeight = this.innerWidth;
 		this.innerWidth = local10;
 	}
 
@@ -164,7 +164,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 		arg1 += this.anInt4273;
 		@Pc(15) int local15 = arg0 + arg1 * Static129.width;
 		@Pc(17) int local17 = 0;
-		@Pc(20) int local20 = this.anInt4278;
+		@Pc(20) int local20 = this.height;
 		@Pc(23) int local23 = this.width;
 		@Pc(27) int local27 = Static129.width - local23;
 		@Pc(29) int local29 = 0;
@@ -201,19 +201,19 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 
 	@OriginalMember(owner = "client!ek", name = "c", descriptor = "()V")
 	public final void method1396() {
-		if (this.width == this.innerWidth && this.anInt4278 == this.anInt4276) {
+		if (this.width == this.innerWidth && this.height == this.innerHeight) {
 			return;
 		}
-		@Pc(17) byte[] local17 = new byte[this.innerWidth * this.anInt4276];
+		@Pc(17) byte[] local17 = new byte[this.innerWidth * this.innerHeight];
 		@Pc(19) int local19 = 0;
-		for (@Pc(21) int local21 = 0; local21 < this.anInt4278; local21++) {
+		for (@Pc(21) int local21 = 0; local21 < this.height; local21++) {
 			for (@Pc(27) int local27 = 0; local27 < this.width; local27++) {
 				local17[local27 + this.anInt4280 + (local21 + this.anInt4273) * this.innerWidth] = this.aByteArray18[local19++];
 			}
 		}
 		this.aByteArray18 = local17;
 		this.width = this.innerWidth;
-		this.anInt4278 = this.anInt4276;
+		this.height = this.innerHeight;
 		this.anInt4280 = 0;
 		this.anInt4273 = 0;
 	}
@@ -221,11 +221,11 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 	@OriginalMember(owner = "client!ek", name = "a", descriptor = "(IIII)V")
 	public final void method1398(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		@Pc(2) int local2 = this.width;
-		@Pc(5) int local5 = this.anInt4278;
+		@Pc(5) int local5 = this.height;
 		@Pc(7) int local7 = 0;
 		@Pc(9) int local9 = 0;
 		@Pc(12) int local12 = this.innerWidth;
-		@Pc(15) int local15 = this.anInt4276;
+		@Pc(15) int local15 = this.innerHeight;
 		@Pc(21) int local21 = (local12 << 16) / arg2;
 		@Pc(27) int local27 = (local15 << 16) / arg3;
 		@Pc(41) int local41;
@@ -279,7 +279,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 		arg1 += this.anInt4273;
 		@Pc(15) int local15 = arg0 + arg1 * Static129.width;
 		@Pc(17) int local17 = 0;
-		@Pc(20) int local20 = this.anInt4278;
+		@Pc(20) int local20 = this.height;
 		@Pc(23) int local23 = this.width;
 		@Pc(27) int local27 = Static129.width - local23;
 		@Pc(29) int local29 = 0;

client/src/main/java/SoftwareModel.java

@@ -1150,7 +1150,7 @@ public final class SoftwareModel extends Model {
 
 	@OriginalMember(owner = "client!w", name = "b", descriptor = "(III)V")
 	@Override
-	public final void method4559(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final void resize(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		for (@Pc(1) int local1 = 0; local1 < this.anInt5788; local1++) {
 			this.anIntArray528[local1] = this.anIntArray528[local1] * arg0 / 128;
 			this.anIntArray527[local1] = this.anIntArray527[local1] * arg1 / 128;

client/src/main/java/SpotAnim.java

@@ -53,12 +53,12 @@ public final class SpotAnim extends Entity {
 		this.anInt590 = arg6 + arg5;
 		this.anInt596 = arg0;
 		this.anInt599 = arg4;
-		@Pc(42) int local42 = Static34.method877(this.anInt596).anInt1754;
+		@Pc(42) int local42 = Static34.method877(this.anInt596).seqId;
 		if (local42 == -1) {
 			this.aBoolean41 = true;
 		} else {
 			this.aBoolean41 = false;
-			this.aClass144_1 = Static36.method941(local42);
+			this.aClass144_1 = Static36.get(local42);
 		}
 	}
 
@@ -99,7 +99,7 @@ public final class SpotAnim extends Entity {
 		while (this.anInt607 > this.aClass144_1.anIntArray474[this.anInt593]) {
 			this.anInt607 -= this.aClass144_1.anIntArray474[this.anInt593];
 			this.anInt593++;
-			if (this.aClass144_1.anIntArray473.length <= this.anInt593) {
+			if (this.aClass144_1.frames.length <= this.anInt593) {
 				this.aBoolean41 = true;
 				break;
 			}

client/src/main/java/SpotAnimType.java

@@ -7,22 +7,22 @@ import org.openrs2.deob.annotation.Pc;
 public final class SpotAnimType {
 
 	@OriginalMember(owner = "client!eg", name = "f", descriptor = "[S")
-	private short[] aShortArray15;
+	private short[] recolorSource;
 
 	@OriginalMember(owner = "client!eg", name = "g", descriptor = "[S")
-	private short[] aShortArray16;
+	private short[] retextureSource;
 
 	@OriginalMember(owner = "client!eg", name = "h", descriptor = "[S")
-	private short[] aShortArray17;
+	private short[] retextureDestination;
 
 	@OriginalMember(owner = "client!eg", name = "m", descriptor = "I")
-	public int anInt1751;
+	public int id;
 
 	@OriginalMember(owner = "client!eg", name = "o", descriptor = "I")
-	private int anInt1753;
+	private int modelId;
 
 	@OriginalMember(owner = "client!eg", name = "s", descriptor = "[S")
-	private short[] aShortArray18;
+	private short[] recolorDestination;
 
 	@OriginalMember(owner = "client!eg", name = "i", descriptor = "Z")
 	public boolean aBoolean100 = false;
@@ -34,16 +34,16 @@ public final class SpotAnimType {
 	private int anInt1749 = 0;
 
 	@OriginalMember(owner = "client!eg", name = "p", descriptor = "I")
-	public int anInt1754 = -1;
+	public int seqId = -1;
 
 	@OriginalMember(owner = "client!eg", name = "n", descriptor = "I")
-	private int anInt1752 = 128;
+	private int resizeY = 128;
 
 	@OriginalMember(owner = "client!eg", name = "b", descriptor = "I")
-	private int anInt1745 = 128;
+	private int resizeXZ = 128;
 
 	@OriginalMember(owner = "client!eg", name = "q", descriptor = "I")
-	private int anInt1755 = 0;
+	private int angle = 0;
 
 	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;B)V")
 	public final void method1316(@OriginalArg(0) Buffer arg0) {
@@ -52,22 +52,22 @@ public final class SpotAnimType {
 			if (local17 == 0) {
 				return;
 			}
-			this.method1318(arg0, local17);
+			this.decode(arg0, local17);
 		}
 	}
 
 	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method1318(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
+	private void decode(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		if (arg1 == 1) {
-			this.anInt1753 = arg0.g2();
+			this.modelId = arg0.g2();
 		} else if (arg1 == 2) {
-			this.anInt1754 = arg0.g2();
+			this.seqId = arg0.g2();
 		} else if (arg1 == 4) {
-			this.anInt1745 = arg0.g2();
+			this.resizeXZ = arg0.g2();
 		} else if (arg1 == 5) {
-			this.anInt1752 = arg0.g2();
+			this.resizeY = arg0.g2();
 		} else if (arg1 == 6) {
-			this.anInt1755 = arg0.g2();
+			this.angle = arg0.g2();
 		} else if (arg1 == 7) {
 			this.anInt1749 = arg0.g1();
 		} else if (arg1 == 8) {
@@ -79,19 +79,19 @@ public final class SpotAnimType {
 			@Pc(88) int local88;
 			if (arg1 == 40) {
 				local78 = arg0.g1();
-				this.aShortArray15 = new short[local78];
+				this.recolorSource = new short[local78];
-				this.aShortArray18 = new short[local78];
+				this.recolorDestination = new short[local78];
 				for (local88 = 0; local88 < local78; local88++) {
-					this.aShortArray15[local88] = (short) arg0.g2();
+					this.recolorSource[local88] = (short) arg0.g2();
-					this.aShortArray18[local88] = (short) arg0.g2();
+					this.recolorDestination[local88] = (short) arg0.g2();
 				}
 			} else if (arg1 == 41) {
 				local78 = arg0.g1();
-				this.aShortArray16 = new short[local78];
+				this.retextureSource = new short[local78];
-				this.aShortArray17 = new short[local78];
+				this.retextureDestination = new short[local78];
 				for (local88 = 0; local88 < local78; local88++) {
-					this.aShortArray16[local88] = (short) arg0.g2();
+					this.retextureSource[local88] = (short) arg0.g2();
-					this.aShortArray17[local88] = (short) arg0.g2();
+					this.retextureDestination[local88] = (short) arg0.g2();
 				}
 			}
 		}
@@ -99,43 +99,43 @@ public final class SpotAnimType {
 
 	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(IBII)Lclient!ak;")
 	public final Model method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(13) Model local13 = (Model) Static56.aClass99_9.get((long) this.anInt1751);
+		@Pc(13) Model local13 = (Model) Static56.models.get((long) this.id);
 		if (local13 == null) {
-			@Pc(28) RawModel local28 = Static77.method1686(Static93.aClass153_41, this.anInt1753);
+			@Pc(28) RawModel local28 = Static77.create(Static93.modelsArchive, this.modelId);
 			if (local28 == null) {
 				return null;
 			}
 			@Pc(40) int local40;
-			if (this.aShortArray15 != null) {
+			if (this.recolorSource != null) {
-				for (local40 = 0; local40 < this.aShortArray15.length; local40++) {
+				for (local40 = 0; local40 < this.recolorSource.length; local40++) {
-					local28.method1687(this.aShortArray15[local40], this.aShortArray18[local40]);
+					local28.recolor(this.recolorSource[local40], this.recolorDestination[local40]);
 				}
 			}
-			if (this.aShortArray16 != null) {
+			if (this.retextureSource != null) {
-				for (local40 = 0; local40 < this.aShortArray16.length; local40++) {
+				for (local40 = 0; local40 < this.retextureSource.length; local40++) {
-					local28.method1669(this.aShortArray16[local40], this.aShortArray17[local40]);
+					local28.retexture(this.retextureSource[local40], this.retextureDestination[local40]);
 				}
 			}
-			local13 = local28.method1679(this.anInt1749 + 64, this.anInt1748 + 850, -30, -50, -30);
+			local13 = local28.createModel(this.anInt1749 + 64, this.anInt1748 + 850, -30, -50, -30);
-			Static56.aClass99_9.put(local13, (long) this.anInt1751);
+			Static56.models.put(local13, (long) this.id);
 		}
 		@Pc(118) Model local118;
-		if (this.anInt1754 == -1 || arg1 == -1) {
+		if (this.seqId == -1 || arg1 == -1) {
 			local118 = local13.method4560(true, true, true);
 		} else {
-			local118 = Static36.method941(this.anInt1754).method4219(arg0, arg2, arg1, local13);
+			local118 = Static36.get(this.seqId).method4219(arg0, arg2, arg1, local13);
 		}
-		if (this.anInt1745 != 128 || this.anInt1752 != 128) {
+		if (this.resizeXZ != 128 || this.resizeY != 128) {
-			local118.method4559(this.anInt1745, this.anInt1752, this.anInt1745);
+			local118.resize(this.resizeXZ, this.resizeY, this.resizeXZ);
 		}
-		if (this.anInt1755 != 0) {
+		if (this.angle != 0) {
-			if (this.anInt1755 == 90) {
+			if (this.angle == 90) {
 				local118.method4563();
 			}
-			if (this.anInt1755 == 180) {
+			if (this.angle == 180) {
 				local118.method4552();
 			}
-			if (this.anInt1755 == 270) {
+			if (this.angle == 270) {
 				local118.method4578();
 			}
 		}

client/src/main/java/Static101.java

@@ -25,7 +25,7 @@ public final class Static101 {
 	@OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
 	public static int method2053(@OriginalArg(0) JagString arg0) {
 		for (@Pc(12) int local12 = 0; local12 < Static153.aClass100Array113.length; local12++) {
-			if (Static153.aClass100Array113[local12].method3111(arg0)) {
+			if (Static153.aClass100Array113[local12].equalsIgnoreCase(arg0)) {
 				return local12;
 			}
 		}

client/src/main/java/Static103.java

@@ -177,7 +177,7 @@ public final class Static103 {
 				Static6.outboundBuffer.p1isaac(92);
 				Static6.outboundBuffer.p2leadd(local36);
 			} else {
-				method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
+				method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.get(local36).name}));
 			}
 			Static72.anInt2043 = 0;
 			Static257.aClass13_7 = Static5.getComponent(local19);
@@ -212,12 +212,12 @@ public final class Static103 {
 			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				@Pc(884) NpcType local884 = local192.type;
-				if (local884.anIntArray357 != null) {
+				if (local884.multiNpcs != null) {
 					local884 = local884.getMultiNpc();
 				}
 				if (local884 != null) {
 					Static6.outboundBuffer.p1isaac(72);
-					Static6.outboundBuffer.p2(local884.anInt3741);
+					Static6.outboundBuffer.p2(local884.id);
 				}
 			}
 		}
@@ -595,7 +595,7 @@ public final class Static103 {
 			Static260.anInt5014 = 1;
 			Static274.anInt4997 = local36;
 			Static43.redraw(local693);
-			Static34.aClass100_203 = Static34.concatenate(new JagString[] { Static8.aClass100_32, Static71.method1439(local36).aClass100_495, Static204.aClass100_896 });
+			Static34.aClass100_203 = Static34.concatenate(new JagString[] { Static8.aClass100_32, Static71.get(local36).name, Static204.aClass100_896 });
 			if (Static34.aClass100_203 == null) {
 				Static34.aClass100_203 = Static92.aClass100_510;
 			}
@@ -789,7 +789,7 @@ public final class Static103 {
 	@OriginalMember(owner = "client!i", name = "r", descriptor = "(I)V")
 	public static void method2239() {
 		Static27.aClass99_4.method3103();
-		Static244.aClass99_32.method3103();
+		Static244.models.method3103();
 		Static118.objectSpriteCache.method3103();
 	}
 

client/src/main/java/Static104.java

@@ -16,7 +16,7 @@ public final class Static104 {
 			return;
 		}
 		if (arg0.anInt3369 != -1 && arg0.anInt3420 == 0) {
-			@Pc(40) SeqType local40 = Static36.method941(arg0.anInt3369);
+			@Pc(40) SeqType local40 = Static36.get(arg0.anInt3369);
 			if (arg0.anInt3405 > 0 && local40.anInt5363 == 0) {
 				arg0.anInt3417++;
 				return;

client/src/main/java/Static109.java

@@ -22,7 +22,7 @@ public final class Static109 {
 			@Pc(18) int local18 = Static33.anIntArray79[local7];
 			@Pc(22) Npc local22 = Static175.npcs[local18];
 			if (local22 != null) {
-				Static263.method4514(local22.type.anInt3713, local22);
+				Static263.method4514(local22.type.soze, local22);
 			}
 		}
 	}

client/src/main/java/Static11.java

@@ -15,7 +15,7 @@ public final class Static11 {
 
 	@OriginalMember(owner = "client!ba", name = "e", descriptor = "(I)V")
 	public static void method443() {
-		Static262.aClass99_35.clear();
+		Static262.headModels.clear();
 	}
 
 	@OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I")

client/src/main/java/Static110.java

@@ -28,7 +28,7 @@ public final class Static110 {
 		@Pc(30) byte[] local30 = Static39.aClass153_23.getFile(11, arg0);
 		local6 = new ParamType();
 		if (local30 != null) {
-			local6.method2076(new Buffer(local30));
+			local6.decode(new Buffer(local30));
 		}
 		Static272.aClass54_14.put(local6, (long) arg0);
 		return local6;

client/src/main/java/Static112.java

@@ -115,20 +115,20 @@ public final class Static112 {
 	@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
 	public static int getSound(@OriginalArg(0) Npc arg0) {
 		@Pc(13) NpcType local13 = arg0.type;
-		if (local13.anIntArray357 != null) {
+		if (local13.multiNpcs != null) {
 			local13 = local13.getMultiNpc();
 			if (local13 == null) {
 				return -1;
 			}
 		}
-		@Pc(29) int local29 = local13.anInt3747;
+		@Pc(29) int local29 = local13.walkSound;
 		@Pc(33) BasType local33 = arg0.method2681();
 		if (local33.idleAnimationId == arg0.anInt3366) {
-			local29 = local13.anInt3728;
+			local29 = local13.idleSound;
 		} else if (arg0.anInt3366 == local33.runAnimationId || local33.runAnimationId2 == arg0.anInt3366 || arg0.anInt3366 == local33.runAnimationId4 || arg0.anInt3366 == local33.runAnimationId3) {
-			local29 = local13.anInt3734;
+			local29 = local13.runSound;
 		} else if (local33.anInt1062 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1042 || arg0.anInt3366 == local33.anInt1048 || arg0.anInt3366 == local33.anInt1066) {
-			local29 = local13.anInt3745;
+			local29 = local13.crawlSound;
 		}
 		return local29;
 	}

client/src/main/java/Static113.java

@@ -28,7 +28,7 @@ public final class Static113 {
 		if (arg1 >= 5 && arg1 <= 8) {
 			arg1 = 4;
 		}
-		@Pc(30) LocType local30 = Static271.method4601(arg0);
+		@Pc(30) LocType local30 = Static271.get(arg0);
-		return local30.method3416(arg1);
+		return local30.isReady(arg1);
 	}
 }

client/src/main/java/Static117.java

@@ -97,7 +97,7 @@ public final class Static117 {
 			@Pc(16) byte[] local16 = arg0.getFile(arg1, arg2);
 			return local16 == null ? null : new VorbisSound(local16);
 		} else {
-			arg0.method4491(arg2, arg1);
+			arg0.isFileReady(arg2, arg1);
 			return null;
 		}
 	}

client/src/main/java/Static118.java

@@ -53,22 +53,22 @@ public final class Static118 {
 							local105 = local15.anInt522;
 						}
 						if (local105 != -1) {
-							@Pc(118) SeqType local118 = Static36.method941(local105);
+							@Pc(118) SeqType local118 = Static36.get(local105);
 							if (local118 != null) {
 								local15.anInt500 += Static178.anInt4247;
 								while (local15.anInt500 > local118.anIntArray474[local15.anInt510]) {
 									local15.anInt500 -= local118.anIntArray474[local15.anInt510];
 									local15.anInt510++;
-									if (local118.anIntArray473.length <= local15.anInt510) {
+									if (local118.frames.length <= local15.anInt510) {
 										local15.anInt510 -= local118.anInt5362;
-										if (local15.anInt510 < 0 || local118.anIntArray473.length <= local15.anInt510) {
+										if (local15.anInt510 < 0 || local118.frames.length <= local15.anInt510) {
 											local15.anInt510 = 0;
 										}
 									}
 									local15.anInt496 = local15.anInt510 + 1;
-									if (local118.anIntArray473.length <= local15.anInt496) {
+									if (local118.frames.length <= local15.anInt496) {
 										local15.anInt496 -= local118.anInt5362;
-										if (local15.anInt496 < 0 || local118.anIntArray473.length <= local15.anInt496) {
+										if (local15.anInt496 < 0 || local118.frames.length <= local15.anInt496) {
 											local15.anInt496 = -1;
 										}
 									}

client/src/main/java/Static121.java

@@ -17,7 +17,7 @@ public final class Static121 {
 	public static int anInt3041;
 
 	@OriginalMember(owner = "client!jg", name = "j", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_45;
+	public static Js5 modelsArchive;
 
 	@OriginalMember(owner = "client!jg", name = "e", descriptor = "Z")
 	public static boolean aBoolean154 = false;

client/src/main/java/Static122.java

@@ -46,15 +46,15 @@ public final class Static122 {
 			local13.locType = arg1;
 			local13.sound = arg1.sound;
 			local13.anInt2032 = arg1.anInt4419;
-			@Pc(57) int local57 = arg1.anInt4397;
+			@Pc(57) int local57 = arg1.width;
-			@Pc(60) int local60 = arg1.anInt4403;
+			@Pc(60) int local60 = arg1.length;
 			if (arg2 == 1 || arg2 == 3) {
-				local57 = arg1.anInt4403;
+				local57 = arg1.length;
-				local60 = arg1.anInt4397;
+				local60 = arg1.width;
 			}
 			local13.anInt2028 = (local60 + arg0) * 128;
 			local13.anInt2037 = (arg4 + local57) * 128;
-			if (arg1.anIntArray380 != null) {
+			if (arg1.multiLocs != null) {
 				local13.multiLocOrNpc = true;
 				local13.update();
 			}
@@ -65,13 +65,13 @@ public final class Static122 {
 		} else if (arg3 != null) {
 			local13.npc = arg3;
 			@Pc(138) NpcType local138 = arg3.type;
-			if (local138.anIntArray357 != null) {
+			if (local138.multiNpcs != null) {
 				local13.multiLocOrNpc = true;
 				local138 = local138.getMultiNpc();
 			}
 			if (local138 != null) {
-				local13.anInt2028 = (local138.anInt3713 + arg0) * 128;
+				local13.anInt2028 = (local138.soze + arg0) * 128;
-				local13.anInt2037 = (arg4 + local138.anInt3713) * 128;
+				local13.anInt2037 = (arg4 + local138.soze) * 128;
 				local13.sound = Static112.getSound(arg3);
 				local13.radius = local138.soundRadius * 128;
 			}

client/src/main/java/Static125.java

@@ -24,7 +24,7 @@ public final class Static125 {
 
 	@OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V")
 	public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
-		Static14.aClass153_8 = arg0;
+		Static14.modelsArchive = arg0;
 		Static216.aClass153_31 = arg1;
 		Static53.anInt1716 = Static216.aClass153_31.method4504(3);
 	}
@@ -52,7 +52,7 @@ public final class Static125 {
 		@Pc(31) byte[] local31 = Static172.aClass153_69.getFile(Static254.method4349(arg0), Static274.method3845(arg0));
 		local10 = new VarbitType();
 		if (local31 != null) {
-			local10.method2651(new Buffer(local31));
+			local10.decode(new Buffer(local31));
 		}
 		aClass99_19.put(local10, (long) arg0);
 		return local10;

client/src/main/java/Static127.java

@@ -243,7 +243,7 @@ public final class Static127 {
 			@Pc(18) int local18;
 			@Pc(38) int local38;
 			@Pc(29) Runtime local29;
-			if (arg0.method3111(Static81.aClass100_476)) {
+			if (arg0.equalsIgnoreCase(Static81.aClass100_476)) {
 				Static119.method2380();
 				for (local18 = 0; local18 < 10; local18++) {
 					System.gc();
@@ -253,7 +253,7 @@ public final class Static127 {
 				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 }));
 			}
 			@Pc(117) int local117;
-			if (arg0.method3111(Static154.aClass100_735)) {
+			if (arg0.equalsIgnoreCase(Static154.aClass100_735)) {
 				Static119.method2380();
 				for (local18 = 0; local18 < 10; local18++) {
 					System.gc();
@@ -269,53 +269,53 @@ public final class Static127 {
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
 				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
 			}
-			if (arg0.method3111(Static240.aClass100_1009)) {
+			if (arg0.equalsIgnoreCase(Static240.aClass100_1009)) {
 				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) }));
 			}
-			if (GlRenderer.enabled && arg0.method3111(Static201.aClass100_406)) {
+			if (GlRenderer.enabled && arg0.equalsIgnoreCase(Static201.aClass100_406)) {
 				System.out.println("oncard_geometry:" + Static63.anInt1945);
 				System.out.println("oncard_2d:" + Static63.onCard2d);
 				System.out.println("oncard_texture:" + Static63.onCardTexture);
 			}
-			if (arg0.method3111(Static257.aClass100_99)) {
+			if (arg0.equalsIgnoreCase(Static257.aClass100_99)) {
 				Static175.method3279();
 			}
-			if (arg0.method3111(Static279.aClass100_1106)) {
+			if (arg0.equalsIgnoreCase(Static279.aClass100_1106)) {
 				Static107.js5NetQueue.quit();
 			}
-			if (arg0.method3111(Static185.aClass100_823)) {
+			if (arg0.equalsIgnoreCase(Static185.aClass100_823)) {
 				Static107.js5NetQueue.method2319();
 			}
-			if (arg0.method3111(Static165.aClass100_775)) {
+			if (arg0.equalsIgnoreCase(Static165.aClass100_775)) {
 				GameShell.signLink.breakConnection();
 				Static124.socket.breakConnection();
 				Static107.js5NetQueue.method2323();
 			}
-			if (arg0.method3111(Static114.aClass100_1100)) {
+			if (arg0.equalsIgnoreCase(Static114.aClass100_1100)) {
 				GameShell.replaceCanvas = true;
 			}
-			if (arg0.method3111(Static148.aClass100_677)) {
+			if (arg0.equalsIgnoreCase(Static148.aClass100_677)) {
 				Static196.setGameState(25);
 			}
-			if (arg0.method3111(Static107.aClass100_566)) {
+			if (arg0.equalsIgnoreCase(Static107.aClass100_566)) {
 				Static43.displayFps = true;
 			}
-			if (arg0.method3111(Static61.aClass100_422)) {
+			if (arg0.equalsIgnoreCase(Static61.aClass100_422)) {
 				Static43.displayFps = false;
 			}
-			if (arg0.method3111(Static96.aClass100_522)) {
+			if (arg0.equalsIgnoreCase(Static96.aClass100_522)) {
 				Static241.setWindowMode(false, 0, -1, -1);
 			}
-			if (arg0.method3111(Static181.aClass100_811)) {
+			if (arg0.equalsIgnoreCase(Static181.aClass100_811)) {
 				Static241.setWindowMode(false, 1, -1, -1);
 			}
-			if (arg0.method3111(Static207.aClass100_904)) {
+			if (arg0.equalsIgnoreCase(Static207.aClass100_904)) {
 				Static241.setWindowMode(false, 2, -1, -1);
 			}
-			if (arg0.method3111(Static99.aClass100_529)) {
+			if (arg0.equalsIgnoreCase(Static99.aClass100_529)) {
 				Static241.setWindowMode(false, 3, 1024, 768);
 			}
-			if (arg0.method3111(Static69.aClass100_443)) {
+			if (arg0.equalsIgnoreCase(Static69.aClass100_443)) {
 				for (local18 = 0; local18 < 4; local18++) {
 					for (local38 = 1; local38 < 103; local38++) {
 						for (local117 = 1; local117 < 103; local117++) {
@@ -332,17 +332,17 @@ public final class Static127 {
 			if (arg0.startsWith(Static170.aClass100_623) && Static83.modeWhere != 0) {
 				Static115.method2312(arg0.substring(6).parseInt());
 			}
-			if (arg0.method3111(Static272.aClass100_990)) {
+			if (arg0.equalsIgnoreCase(Static272.aClass100_990)) {
 				throw new RuntimeException();
 			}
 			if (arg0.startsWith(Static211.aClass100_232)) {
 				Static199.rectDebug = arg0.substring(12).method3144().parseInt();
 				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
 			}
-			if (arg0.method3111(Static181.aClass100_810)) {
+			if (arg0.equalsIgnoreCase(Static181.aClass100_810)) {
 				Static121.aBoolean154 = true;
 			}
-			if (arg0.method3111(Static124.aClass100_596)) {
+			if (arg0.equalsIgnoreCase(Static124.aClass100_596)) {
 				if (Static204.applyTweening) {
 					Static204.applyTweening = false;
 					Static103.method2231(null, 0, Static274.aClass100_943);
@@ -351,7 +351,7 @@ public final class Static127 {
 					Static103.method2231(null, 0, Static50.aClass100_362);
 				}
 			}
-			if (arg0.method3111(Static114.aClass100_1099)) {
+			if (arg0.equalsIgnoreCase(Static114.aClass100_1099)) {
 				if (Static172.shiftClick) {
 					Static154.aClass100_736.method3129();
 					Static172.shiftClick = false;

client/src/main/java/Static137.java

@@ -52,13 +52,13 @@ public final class Static137 {
 				for (local76 = 0; local76 < 104; local76++) {
 					@Pc(169) long local169 = Static20.method602(Static55.level, local37 + 0, local76);
 					if (local169 != 0L) {
-						@Pc(184) LocType local184 = Static271.method4601((int) (local169 >>> 32) & Integer.MAX_VALUE);
+						@Pc(184) LocType local184 = Static271.get((int) (local169 >>> 32) & Integer.MAX_VALUE);
 						@Pc(187) int local187 = local184.anInt4400;
 						@Pc(194) int local194;
-						if (local184.anIntArray380 != null) {
+						if (local184.multiLocs != null) {
-							for (local194 = 0; local194 < local184.anIntArray380.length; local194++) {
+							for (local194 = 0; local194 < local184.multiLocs.length; local194++) {
-								if (local184.anIntArray380[local194] != -1) {
+								if (local184.multiLocs[local194] != -1) {
-									@Pc(216) LocType local216 = Static271.method4601(local184.anIntArray380[local194]);
+									@Pc(216) LocType local216 = Static271.get(local184.multiLocs[local194]);
 									if (local216.anInt4400 >= 0) {
 										local187 = local216.anInt4400;
 										break;
@@ -143,6 +143,6 @@ public final class Static137 {
 	@OriginalMember(owner = "client!kl", name = "c", descriptor = "(II)V")
 	public static void method2666() {
 		Static279.aClass99_38.method3102(5);
-		Static56.aClass99_9.method3102(5);
+		Static56.models.method3102(5);
 	}
 }

client/src/main/java/Static14.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static14 {
 
 	@OriginalMember(owner = "client!bd", name = "g", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_8;
+	public static Js5 modelsArchive;
 
 	@OriginalMember(owner = "client!bd", name = "b", descriptor = "Lclient!na;")
 	public static final JagString aClass100_80 = Static28.parse("(U(Y");

client/src/main/java/Static142.java

@@ -39,7 +39,7 @@ public final class Static142 {
 				@Pc(58) NpcType local58;
 				if (local17 instanceof Npc) {
 					local58 = ((Npc) local17).type;
-					if (local58.anIntArray357 != null) {
+					if (local58.multiNpcs != null) {
 						local58 = local58.getMultiNpc();
 					}
 					if (local58 == null) {
@@ -49,10 +49,10 @@ public final class Static142 {
 				@Pc(161) int local161;
 				if (local5 >= Static267.anInt5774) {
 					local58 = ((Npc) local17).type;
-					if (local58.anIntArray357 != null) {
+					if (local58.multiNpcs != null) {
 						local58 = local58.getMultiNpc();
 					}
-					if (local58.anInt3732 >= 0 && Static138.aClass3_Sub2_Sub1Array5.length > local58.anInt3732) {
+					if (local58.prayerIcon >= 0 && Static138.aClass3_Sub2_Sub1Array5.length > local58.prayerIcon) {
 						if (local58.anInt3730 == -1) {
 							local265 = local17.method2691() + 15;
 						} else {
@@ -60,7 +60,7 @@ public final class Static142 {
 						}
 						Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
 						if (Static65.anInt1951 > -1) {
-							Static138.aClass3_Sub2_Sub1Array5[local58.anInt3732].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548);
+							Static138.aClass3_Sub2_Sub1Array5[local58.prayerIcon].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548);
 						}
 					}
 					@Pc(308) Class102[] local308 = Static143.aClass102Array1;
@@ -126,11 +126,11 @@ public final class Static142 {
 					@Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1];
 					if (local17 instanceof Npc) {
 						@Pc(518) Npc local518 = (Npc) local17;
-						@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.get((long) local518.type.anInt3736);
+						@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.get((long) local518.type.hitBarId);
 						if (local528 == null) {
-							local528 = Static209.method3708(local518.type.anInt3736, Static209.js5Archive8);
+							local528 = Static209.method3708(local518.type.hitBarId, Static209.js5Archive8);
 							if (local528 != null) {
-								Static73.aClass99_10.put(local528, (long) local518.type.anInt3736);
+								Static73.aClass99_10.put(local528, (long) local518.type.hitBarId);
 							}
 						}
 						if (local528 != null && local528.length == 2) {

client/src/main/java/Static144.java

@@ -227,9 +227,9 @@ public final class Static144 {
 									if (local233 != 0) {
 										local254 = local222 >> 14 & 0x3;
 										@Pc(998) MsiType local998 = Static40.method1013(local233 - 1);
-										@Pc(1003) SoftwareIndexedSprite local1003 = local998.method9(local254);
+										@Pc(1003) SoftwareIndexedSprite local1003 = local998.getSprite(local254);
 										if (local1003 != null) {
-											local276 = local162 * local1003.anInt4278 / 4;
+											local276 = local162 * local1003.height / 4;
 											local270 = local62 * local1003.width / 4;
 											if (local998.aBoolean2) {
 												local312 = local222 >> 16 & 0xF;

client/src/main/java/Static155.java

@@ -36,8 +36,8 @@ public final class Static155 {
 		@Pc(12) JagString local12 = arg1.toLowerCase();
 		@Pc(14) int local14 = 0;
 		for (@Pc(16) int local16 = 0; local16 < Static170.anInt3245; local16++) {
-			@Pc(27) ObjType local27 = Static71.method1439(local16);
+			@Pc(27) ObjType local27 = Static71.get(local16);
-			if ((!arg0 || local27.aBoolean132) && local27.anInt2358 == -1 && local27.anInt2334 == -1 && local27.anInt2370 == 0 && local27.aClass100_495.toLowerCase().indexOf(local12) != -1) {
+			if ((!arg0 || local27.stockMarket) && local27.certificateTemplate == -1 && local27.lentTemplate == -1 && local27.dummyItem == 0 && local27.name.toLowerCase().indexOf(local12) != -1) {
 				if (local14 >= 250) {
 					Static169.aShortArray52 = null;
 					Static111.anInt2905 = -1;
@@ -58,7 +58,7 @@ public final class Static155 {
 		Static111.anInt2905 = local14;
 		@Pc(117) JagString[] local117 = new JagString[Static111.anInt2905];
 		for (@Pc(119) int local119 = 0; local119 < Static111.anInt2905; local119++) {
-			local117[local119] = Static71.method1439(local8[local119]).aClass100_495;
+			local117[local119] = Static71.get(local8[local119]).name;
 		}
 		Static202.method3656(local117, Static169.aShortArray52);
 	}
@@ -66,9 +66,9 @@ public final class Static155 {
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(II)I")
 	public static int getVarbit(@OriginalArg(1) int arg0) {
 		@Pc(13) VarbitType local13 = Static125.method2449(arg0);
-		@Pc(16) int local16 = local13.anInt3327;
+		@Pc(16) int local16 = local13.baseVar;
-		@Pc(19) int local19 = local13.anInt3323;
+		@Pc(19) int local19 = local13.endBit;
-		@Pc(22) int local22 = local13.anInt3318;
+		@Pc(22) int local22 = local13.startBit;
 		@Pc(29) int local29 = Class3_Sub9.anIntArray135[local19 - local22];
 		return Static7.varps[local16] >> local22 & local29;
 	}

client/src/main/java/Static158.java

@@ -156,20 +156,20 @@ public final class Static158 {
 					@Pc(125) int local125 = local113 + (Static238.regionBitPacked[local16] >> 8) * 64 - Static225.originX;
 					@Pc(129) int local129 = local103 & 0x3F;
 					@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ;
-					@Pc(148) NpcType local148 = Static214.method4363(local74.g2());
+					@Pc(148) NpcType local148 = Static214.get(local74.g2());
-					if (Static175.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
+					if (Static175.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.soze + local125 < 104 && local142 >= 0 && local142 + local148.soze < 104) {
 						Static175.npcs[local97] = new Npc();
 						@Pc(198) Npc local198 = Static175.npcs[local97];
 						Static33.anIntArray79[Static272.anInt5214++] = local97;
 						local198.anInt3430 = Static83.loop;
 						local198.method2698(local148);
-						local198.method2692(local198.type.anInt3713);
+						local198.method2692(local198.type.soze);
 						local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.type.aByte11];
 						local198.anInt3376 = local198.type.anInt3733;
 						if (local198.anInt3376 == 0) {
 							local198.anInt3381 = 0;
 						}
-						local198.anInt3365 = local198.type.anInt3737;
+						local198.anInt3365 = local198.type.basId;
 						local198.method2683(local198.getSize(), local125, local142, true);
 					}
 				}

client/src/main/java/Static159.java

@@ -39,7 +39,7 @@ public final class Static159 {
 					if (local15 == -1) {
 						arg1.aClass147Array3[local25] = null;
 					} else {
-						@Pc(60) SeqType local60 = Static36.method941(local15);
+						@Pc(60) SeqType local60 = Static36.get(local15);
 						@Pc(65) Class147 local65 = arg1.aClass147Array3[local25];
 						@Pc(68) int local68 = local60.anInt5347;
 						if (local65 != null) {
@@ -56,7 +56,7 @@ public final class Static159 {
 								} else if (local68 == 2) {
 									local65.anInt5400 = 0;
 								}
-							} else if (local60.anInt5355 >= Static36.method941(local65.anInt5396).anInt5355) {
+							} else if (local60.anInt5355 >= Static36.get(local65.anInt5396).anInt5355) {
 								local65 = arg1.aClass147Array3[local25] = null;
 							}
 						}

client/src/main/java/Static164.java

@@ -36,8 +36,8 @@ public final class Static164 {
 			local28 = (int) local14 >> 20 & 0x3;
 			local35 = (int) local14 >> 14 & 0x1F;
 			local42 = Integer.MAX_VALUE & (int) (local14 >>> 32);
-			local46 = Static271.method4601(local42);
+			local46 = Static271.get(local42);
-			if (local46.anInt4415 == -1) {
+			if (local46.mapSceneId == -1) {
 				local65 = arg1;
 				if (local14 > 0L) {
 					local65 = arg3;
@@ -110,8 +110,8 @@ public final class Static164 {
 			local28 = (int) local14 >> 20 & 0x3;
 			local35 = (int) local14 >> 14 & 0x1F;
 			local42 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
-			local46 = Static271.method4601(local42);
+			local46 = Static271.get(local42);
-			if (local46.anInt4415 == -1) {
+			if (local46.mapSceneId == -1) {
 				if (local35 == 9) {
 					local65 = 15658734;
 					if (local14 > 0L) {
@@ -139,8 +139,8 @@ public final class Static164 {
 		if (local14 != 0L) {
 			local28 = (int) local14 >> 20 & 0x3;
 			local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
-			@Pc(586) LocType local586 = Static271.method4601(local35);
+			@Pc(586) LocType local586 = Static271.get(local35);
-			if (local586.anInt4415 != -1 && !Static33.method867(arg0, local586, arg2, local28)) {
+			if (local586.mapSceneId != -1 && !Static33.method867(arg0, local586, arg2, local28)) {
 				return false;
 			}
 		}
@@ -166,36 +166,36 @@ public final class Static164 {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZILclient!ve;)Lclient!ek;")
-	public static SoftwareIndexedSprite method3119(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
+	public static SoftwareIndexedSprite loadSoftwareIndexedSprite(@OriginalArg(2) int arg0, @OriginalArg(3) Js5 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static134.method2619() : null;
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IBZIZIIZ)Lclient!qf;")
 	public static Sprite method3150(@OriginalArg(0) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) boolean arg6) {
-		@Pc(5) ObjType local5 = Static71.method1439(arg2);
+		@Pc(5) ObjType local5 = Static71.get(arg2);
-		if (arg5 > 1 && local5.anIntArray214 != null) {
+		if (arg5 > 1 && local5.countObj != null) {
 			@Pc(15) int local15 = -1;
 			for (@Pc(17) int local17 = 0; local17 < 10; local17++) {
-				if (arg5 >= local5.anIntArray212[local17] && local5.anIntArray212[local17] != 0) {
+				if (arg5 >= local5.countCount[local17] && local5.countCount[local17] != 0) {
-					local15 = local5.anIntArray214[local17];
+					local15 = local5.countObj[local17];
 				}
 			}
 			if (local15 != -1) {
-				local5 = Static71.method1439(local15);
+				local5 = Static71.get(local15);
 			}
 		}
-		@Pc(60) SoftwareModel local60 = local5.method1834();
+		@Pc(60) SoftwareModel local60 = local5.getInvModel();
 		if (local60 == null) {
 			return null;
 		}
 		@Pc(71) SoftwareSprite local71 = null;
-		if (local5.anInt2358 != -1) {
+		if (local5.certificateTemplate != -1) {
-			local71 = (SoftwareSprite) method3150(0, true, local5.anInt2356, false, 1, 10, true);
+			local71 = (SoftwareSprite) method3150(0, true, local5.certificateLink, false, 1, 10, true);
 			if (local71 == null) {
 				return null;
 			}
-		} else if (local5.anInt2334 != -1) {
+		} else if (local5.lentTemplate != -1) {
-			local71 = (SoftwareSprite) method3150(arg0, true, local5.anInt2363, false, arg4, arg5, false);
+			local71 = (SoftwareSprite) method3150(arg0, true, local5.lentLink, false, arg4, arg5, false);
 			if (local71 == null) {
 				return null;
 			}
@@ -209,16 +209,16 @@ public final class Static164 {
 		Static129.method2491(local133.anIntArray20, 36, 32);
 		Rasteriser.prepare();
 		Rasteriser.setBounds(16, 16);
-		@Pc(145) int local145 = local5.anInt2375;
+		@Pc(145) int local145 = local5.zoom2d;
 		Rasteriser.jagged = false;
 		if (arg6) {
 			local145 = (int) ((double) local145 * 1.5D);
 		} else if (arg4 == 2) {
 			local145 = (int) ((double) local145 * 1.04D);
 		}
-		@Pc(176) int local176 = MathUtils.anIntArray225[local5.anInt2353] * local145 >> 16;
+		@Pc(176) int local176 = MathUtils.anIntArray225[local5.xAngle2d] * local145 >> 16;
-		@Pc(185) int local185 = MathUtils.anIntArray223[local5.anInt2353] * local145 >> 16;
+		@Pc(185) int local185 = MathUtils.anIntArray223[local5.xAngle2d] * local145 >> 16;
-		local60.method4571(local5.anInt2369, local5.anInt2339, local5.anInt2353, local5.anInt2359, local185 + local5.anInt2319 - local60.method4549() / 2, local5.anInt2319 + local176, -1L);
+		local60.method4571(local5.yAngle2d, local5.zAngle2d, local5.xAngle2d, local5.xOffset2d, local185 + local5.yOffset2d - local60.method4549() / 2, local5.yOffset2d + local176, -1L);
 		if (arg4 >= 1) {
 			local133.method303(1);
 			if (arg4 >= 2) {
@@ -229,14 +229,14 @@ public final class Static164 {
 		if (arg0 != 0) {
 			local133.method314(arg0);
 		}
-		if (local5.anInt2358 != -1) {
+		if (local5.certificateTemplate != -1) {
 			local71.method1423(0, 0);
-		} else if (local5.anInt2334 != -1) {
+		} else if (local5.lentTemplate != -1) {
 			Static129.method2491(local71.anIntArray20, 36, 32);
 			local133.method1423(0, 0);
 			local133 = local71;
 		}
-		if (arg3 && (local5.anInt2336 == 1 || arg5 != 1) && arg5 != -1) {
+		if (arg3 && (local5.stackable == 1 || arg5 != 1) && arg5 != -1) {
 			Static256.aClass3_Sub2_Sub9_Sub1_1.method2857(Static52.method1288(arg5), 0, 9, 16776960, 1);
 		}
 		Static129.method2491(local118, local120, local122);

client/src/main/java/Static166.java

@@ -73,8 +73,8 @@ public final class Static166 {
 											Static83.anIntArrayArrayArray3[local84][local95] = new int[4096];
 										}
 										local214--;
-										@Pc(312) LocType local312 = Static271.method4601(local214);
+										@Pc(312) LocType local312 = Static271.get(local214);
-										if (local312.anIntArray380 != null) {
+										if (local312.multiLocs != null) {
 											local312 = local312.getMultiLoc();
 											if (local312 == null || local312.anInt4400 == -1) {
 												continue;

client/src/main/java/Static173.java

@@ -8,7 +8,7 @@ public final class Static173 {
 	public static int[] anIntArray367;
 
 	@OriginalMember(owner = "client!nk", name = "E", descriptor = "I")
-	public static int anInt4183;
+	public static int redDelta;
 
 	@OriginalMember(owner = "client!nk", name = "L", descriptor = "[Lclient!mm;")
 	public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array9;
@@ -31,7 +31,7 @@ public final class Static173 {
 		@Pc(171) int local171;
 		for (local7 = 0; local7 < Static272.anInt5214; local7++) {
 			local16 = Static175.npcs[Static33.anIntArray79[local7]];
-			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.method2933()) {
+			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
 				@Pc(42) int local42 = local16.getSize();
 				@Pc(97) int local97;
 				if (local42 == 1) {
@@ -70,7 +70,7 @@ public final class Static173 {
 		label200: for (local7 = 0; local7 < Static272.anInt5214; local7++) {
 			local16 = Static175.npcs[Static33.anIntArray79[local7]];
 			@Pc(262) long local262 = (long) Static33.anIntArray79[local7] << 32 | 0x20000000L;
-			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.method2933()) {
+			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
 				local107 = local16.getSize();
 				if (local107 == 1) {
 					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {

client/src/main/java/Static176.java

@@ -22,7 +22,7 @@ public final class Static176 {
 	@OriginalMember(owner = "client!ob", name = "a", descriptor = "(B)V")
 	public static void method3302() {
 		Static27.aClass99_4.clear();
-		Static244.aClass99_32.clear();
+		Static244.models.clear();
 		Static118.objectSpriteCache.clear();
 	}
 
@@ -96,22 +96,22 @@ public final class Static176 {
 				local112 = local121;
 				@Pc(240) int local240;
 				if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) {
-					@Pc(172) LocType local172 = Static271.method4601(local140);
+					@Pc(172) LocType local172 = Static271.get(local140);
-					if (local172.anIntArray380 != null) {
+					if (local172.multiLocs != null) {
 						local172 = local172.getMultiLoc();
 					}
 					if (local172 == null) {
 						continue;
 					}
 					if (Static260.anInt5014 == 1) {
-						Static98.method1966(Static169.anInt4075, local121, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static27.aClass100_164, local172.aClass100_830 }), local47, (short) 14, LocalizedText.USE, local147);
+						Static98.method1966(Static169.anInt4075, local121, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static27.aClass100_164, local172.name}), local47, (short) 14, LocalizedText.USE, local147);
 					} else if (Static241.aBoolean302) {
 						@Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
-						if ((Static274.anInt4999 & 0x4) != 0 && (local363 == null || local172.method3423(local363.anInt2667, Static121.anInt3039) != local363.anInt2667)) {
+						if ((Static274.anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
-							Static98.method1966(Static246.anInt5393, local121, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.aClass100_830 }), local47, (short) 38, Static102.aClass100_545, local147);
+							Static98.method1966(Static246.anInt5393, local121, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.name}), local47, (short) 38, Static102.aClass100_545, local147);
 						}
 					} else {
-						@Pc(228) JagString[] local228 = local172.aClass100Array130;
+						@Pc(228) JagString[] local228 = local172.ops;
 						if (Static208.aBoolean237) {
 							local228 = Static279.method4664(local228);
 						}
@@ -129,23 +129,23 @@ public final class Static176 {
 									if (local240 == 2) {
 										local254 = 49;
 									}
-									if (local172.anInt4406 == local240) {
+									if (local172.cursor1Op == local240) {
-										local268 = local172.anInt4416;
+										local268 = local172.cursor1;
 									}
 									if (local240 == 3) {
 										local254 = 46;
 									}
-									if (local240 == local172.anInt4420) {
+									if (local240 == local172.cursor2Op) {
-										local268 = local172.anInt4423;
+										local268 = local172.cursor2;
 									}
 									if (local240 == 4) {
 										local254 = 1001;
 									}
-									Static98.method1966(local268, local121, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.aClass100_830 }), local47, local254, local228[local240], local147);
+									Static98.method1966(local268, local121, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, local254, local228[local240], local147);
 								}
 							}
 						}
-						Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.aClass100_830 }), local47, (short) 1004, LocalizedText.EXAMINE, local147);
+						Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, (short) 1004, LocalizedText.EXAMINE, local147);
 					}
 				}
 				@Pc(514) int local514;
@@ -156,14 +156,14 @@ public final class Static176 {
 				@Pc(597) Player local597;
 				if (local133 == 1) {
 					@Pc(421) Npc local421 = Static175.npcs[local140];
-					if ((local421.type.anInt3713 & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.anInt3713 & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
+					if ((local421.type.soze & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.soze & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
-						local479 = local421.xFine + 64 - local421.type.anInt3713 * 64;
+						local479 = local421.xFine + 64 - local421.type.soze * 64;
-						local240 = local421.zFine - (local421.type.anInt3713 - 1) * 64;
+						local240 = local421.zFine - (local421.type.soze - 1) * 64;
 						for (local493 = 0; local493 < Static272.anInt5214; local493++) {
 							local502 = Static175.npcs[Static33.anIntArray79[local493]];
-							local514 = local502.xFine + 64 - local502.type.anInt3713 * 64;
+							local514 = local502.xFine + 64 - local502.type.soze * 64;
-							local526 = local502.zFine + 64 - local502.type.anInt3713 * 64;
+							local526 = local502.zFine + 64 - local502.type.soze * 64;
-							if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.anInt3713 - (local514 - local479 >> 7) >= local502.type.anInt3713 && local240 <= local526 && local502.type.anInt3713 <= local421.type.anInt3713 - (local526 - local240 >> 7)) {
+							if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.soze - (local514 - local479 >> 7) >= local502.type.soze && local240 <= local526 && local502.type.soze <= local421.type.soze - (local526 - local240 >> 7)) {
 								Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
 							}
 						}
@@ -171,7 +171,7 @@ public final class Static176 {
 							local597 = Static159.players[Static105.anIntArray256[local493]];
 							local514 = local597.xFine + 64 - local597.getSize() * 64;
 							local526 = local597.zFine + 64 - local597.getSize() * 64;
-							if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.anInt3713 - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.anInt3713 - (local526 - local240 >> 7)) {
+							if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.soze - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.soze - (local526 - local240 >> 7)) {
 								Static217.method3767(Static105.anIntArray256[local493], local147, local597, local47);
 							}
 						}
@@ -185,9 +185,9 @@ public final class Static176 {
 						local240 = local688.zFine + 64 - local688.getSize() * 64;
 						for (local493 = 0; local493 < Static272.anInt5214; local493++) {
 							local502 = Static175.npcs[Static33.anIntArray79[local493]];
-							local514 = local502.xFine + 64 - local502.type.anInt3713 * 64;
+							local514 = local502.xFine + 64 - local502.type.soze * 64;
-							local526 = local502.zFine + 64 - local502.type.anInt3713 * 64;
+							local526 = local502.zFine + 64 - local502.type.soze * 64;
-							if (local502 != null && local514 >= local479 && local502.type.anInt3713 <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.anInt3713 <= local688.getSize() - (local526 - local240 >> 7)) {
+							if (local502 != null && local514 >= local479 && local502.type.soze <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.soze <= local688.getSize() - (local526 - local240 >> 7)) {
 								Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
 							}
 						}
@@ -207,16 +207,16 @@ public final class Static176 {
 					if (local931 != null) {
 						for (@Pc(940) ObjStackNode local940 = (ObjStackNode) local931.method2279(); local940 != null; local940 = (ObjStackNode) local931.method2286()) {
 							local240 = local940.aClass8_Sub7_1.anInt5555;
-							@Pc(951) ObjType local951 = Static71.method1439(local240);
+							@Pc(951) ObjType local951 = Static71.get(local240);
 							if (Static260.anInt5014 == 1) {
-								Static98.method1966(Static169.anInt4075, (long) local240, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 33, LocalizedText.USE, local147);
+								Static98.method1966(Static169.anInt4075, (long) local240, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.name}), local47, (short) 33, LocalizedText.USE, local147);
 							} else if (Static241.aBoolean302) {
 								@Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
-								if ((Static274.anInt4999 & 0x1) != 0 && (local1142 == null || local951.method1829(local1142.anInt2667, Static121.anInt3039) != local1142.anInt2667)) {
+								if ((Static274.anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) {
-									Static98.method1966(Static246.anInt5393, (long) local240, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 39, Static102.aClass100_545, local147);
+									Static98.method1966(Static246.anInt5393, (long) local240, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local951.name}), local47, (short) 39, Static102.aClass100_545, local147);
 								}
 							} else {
-								@Pc(997) JagString[] local997 = local951.aClass100Array72;
+								@Pc(997) JagString[] local997 = local951.ops;
 								if (Static208.aBoolean237) {
 									local997 = Static279.method4664(local997);
 								}
@@ -230,14 +230,14 @@ public final class Static176 {
 											local1025 = 34;
 										}
 										@Pc(1041) int local1041 = -1;
-										if (local514 == local951.anInt2338) {
+										if (local514 == local951.cursor1Op) {
-											local1041 = local951.anInt2327;
+											local1041 = local951.cursor1;
 										}
 										if (local514 == 2) {
 											local1025 = 18;
 										}
-										if (local951.anInt2355 == local514) {
+										if (local951.cursor2Op == local514) {
-											local1041 = local951.anInt2321;
+											local1041 = local951.cursor2;
 										}
 										if (local514 == 3) {
 											local1025 = 20;
@@ -245,10 +245,10 @@ public final class Static176 {
 										if (local514 == 4) {
 											local1025 = 24;
 										}
-										Static98.method1966(local1041, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.aClass100_495 }), local47, local1025, local997[local514], local147);
+										Static98.method1966(local1041, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, local1025, local997[local514], local147);
 									}
 								}
-								Static98.method1966(Static225.anInt5073, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.aClass100_495 }), local47, (short) 1002, LocalizedText.EXAMINE, local147);
+								Static98.method1966(Static225.anInt5073, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, (short) 1002, LocalizedText.EXAMINE, local147);
 							}
 						}
 					}

client/src/main/java/Static178.java

@@ -47,9 +47,9 @@ public final class Static178 {
 		@Pc(27) int local27 = 0;
 		for (@Pc(29) int local29 = 0; local29 < local19.objectIds.length; local29++) {
 			if (local19.objectIds[local29] >= 0 && Static170.anInt3245 > local19.objectIds[local29]) {
-				@Pc(56) ObjType local56 = Static71.method1439(local19.objectIds[local29]);
+				@Pc(56) ObjType local56 = Static71.get(local19.objectIds[local29]);
-				if (local56.aClass133_6 != null) {
+				if (local56.params != null) {
-					@Pc(68) IntNode local68 = (IntNode) local56.aClass133_6.get((long) arg2);
+					@Pc(68) IntNode local68 = (IntNode) local56.params.get((long) arg2);
 					if (local68 != null) {
 						if (arg0) {
 							local27 += local19.anIntArray422[local29] * local68.value;

client/src/main/java/Static180.java

@@ -15,16 +15,16 @@ public final class Static180 {
 
 	@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) {
-		Static250.aClass153_101 = arg1;
+		Static250.spritesArchive = arg1;
 		@Pc(12) int local12 = (int) (Math.random() * 21.0D) - 10;
 		Static98.aClass153_42 = arg0;
 		@Pc(21) int local21 = (int) (Math.random() * 21.0D) - 10;
 		Static98.aClass153_42.method4504(34);
 		@Pc(33) int local33 = (int) (Math.random() * 21.0D) - 10;
 		@Pc(40) int local40 = (int) (Math.random() * 41.0D) - 20;
-		Static266.anInt5344 = local40 + local21;
+		Static266.blueDelta = local40 + local21;
-		Static85.anInt2262 = local12 + local40;
+		Static85.greenDelta = local12 + local40;
-		Static173.anInt4183 = local40 + local33;
+		Static173.redDelta = local40 + local33;
 	}
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(BIILclient!fe;III)V")

client/src/main/java/Static181.java

@@ -75,7 +75,7 @@ public final class Static181 {
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(ILclient!ve;Lclient!ve;Z)V")
 	public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
 		Static30.aBoolean61 = true;
-		Static121.aClass153_45 = arg1;
+		Static121.modelsArchive = arg1;
 		Static146.aClass153_54 = arg0;
 	}
 }

client/src/main/java/Static185.java

@@ -39,18 +39,18 @@ public final class Static185 {
 		if (arg2 < Static146.anInt3508) {
 			Static146.anInt3508 = arg2;
 		}
-		@Pc(62) LocType local62 = Static271.method4601(arg5);
+		@Pc(62) LocType local62 = Static271.get(arg5);
 		if (GlRenderer.enabled && local62.aBoolean216) {
 			return;
 		}
 		@Pc(84) int local84;
 		@Pc(81) int local81;
 		if (arg9 == 1 || arg9 == 3) {
-			local81 = local62.anInt4397;
+			local81 = local62.width;
-			local84 = local62.anInt4403;
+			local84 = local62.length;
 		} else {
-			local84 = local62.anInt4397;
+			local84 = local62.width;
-			local81 = local62.anInt4403;
+			local81 = local62.length;
 		}
 		@Pc(103) int local103;
 		@Pc(112) int local112;
@@ -96,7 +96,7 @@ public final class Static185 {
 		if (local62.aBoolean213) {
 			local261 |= 0x80000000L;
 		}
-		if (local62.method3422()) {
+		if (local62.hasAreaSound()) {
 			Static122.method2411(arg8, local62, arg9, null, arg7, arg2, null);
 		}
 		@Pc(330) boolean local330 = local62.aBoolean212 & !arg3;
@@ -105,7 +105,7 @@ public final class Static185 {
 		@Pc(403) Class139 local403;
 		if (arg6 == 22) {
 			if (Static250.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) {
-				if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+				if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 					local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173);
 					if (GlRenderer.enabled && local330) {
 						Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -120,7 +120,7 @@ public final class Static185 {
 				}
 			}
 		} else if (arg6 == 10 || arg6 == 11) {
-			if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+			if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 				local403 = local62.method3428(arg6 == 11 ? arg9 + 4 : arg9, local165, local153, 10, local199, local213, arg1, null, local330, local173);
 				if (GlRenderer.enabled && local330) {
 					Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -152,7 +152,7 @@ public final class Static185 {
 				arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
 			}
 		} else if (arg6 >= 12) {
-			if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+			if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 				local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173);
 				if (GlRenderer.enabled && local330) {
 					Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -169,7 +169,7 @@ public final class Static185 {
 				arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
 			}
 		} else if (arg6 == 0) {
-			if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+			if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 				local403 = local62.method3428(arg9, local165, local153, 0, local199, local213, arg1, null, local330, local173);
 				if (GlRenderer.enabled && local330) {
 					Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -217,11 +217,11 @@ public final class Static185 {
 			if (local62.anInt4435 != 0 && arg4 != null) {
 				arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
 			}
-			if (local62.anInt4428 != 16) {
+			if (local62.wallDecorOffsetScale != 16) {
-				Static18.method559(arg2, arg7, arg8, local62.anInt4428);
+				Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
 			}
 		} else if (arg6 == 1) {
-			if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+			if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 				local403 = local62.method3428(arg9, local165, local153, 1, local199, local213, arg1, null, local330, local173);
 				if (GlRenderer.enabled && local330) {
 					Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -251,7 +251,7 @@ public final class Static185 {
 				local1226 = arg9 + 1 & 0x3;
 				@Pc(1269) Entity local1269;
 				@Pc(1254) Entity local1254;
-				if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+				if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 					@Pc(1287) Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173);
 					if (GlRenderer.enabled && local330) {
 						Static242.method4211(local1287.aClass36_Sub1_3, local165, local201, local173);
@@ -285,11 +285,11 @@ public final class Static185 {
 				if (local62.anInt4435 != 0 && arg4 != null) {
 					arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
 				}
-				if (local62.anInt4428 != 16) {
+				if (local62.wallDecorOffsetScale != 16) {
-					Static18.method559(arg2, arg7, arg8, local62.anInt4428);
+					Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
 				}
 			} else if (arg6 == 3) {
-				if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+				if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 					local403 = local62.method3428(arg9, local165, local153, 3, local199, local213, arg1, null, local330, local173);
 					if (GlRenderer.enabled && local330) {
 						Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -314,7 +314,7 @@ public final class Static185 {
 					arg4.method3040(arg9, arg6, local62.aBoolean207, arg8, arg7);
 				}
 			} else if (arg6 == 9) {
-				if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+				if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 					local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173);
 					if (GlRenderer.enabled && local330) {
 						Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -327,11 +327,11 @@ public final class Static185 {
 				if (local62.anInt4435 != 0 && arg4 != null) {
 					arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
 				}
-				if (local62.anInt4428 != 16) {
+				if (local62.wallDecorOffsetScale != 16) {
-					Static18.method559(arg2, arg7, arg8, local62.anInt4428);
+					Static18.method559(arg2, arg7, arg8, local62.wallDecorOffsetScale);
 				}
 			} else if (arg6 == 4) {
-				if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+				if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 					local403 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173);
 					if (GlRenderer.enabled && local330) {
 						Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173);
@@ -349,9 +349,9 @@ public final class Static185 {
 					local1226 = 16;
 					local1889 = Static265.method4521(arg2, arg7, arg8);
 					if (local1889 != 0L) {
-						local1226 = Static271.method4601(Integer.MAX_VALUE & (int) (local1889 >>> 32)).anInt4428;
+						local1226 = Static271.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale;
 					}
-					if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+					if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 						local1950 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173);
 						if (GlRenderer.enabled && local330) {
 							Static242.method4211(local1950.aClass36_Sub1_3, local165 - Static34.anIntArray80[arg9] * 8, local201, local173 - Static238.anIntArray469[arg9] * 8);
@@ -365,9 +365,9 @@ public final class Static185 {
 					local1226 = 8;
 					local1889 = Static265.method4521(arg2, arg7, arg8);
 					if (local1889 != 0L) {
-						local1226 = Static271.method4601(Integer.MAX_VALUE & (int) (local1889 >>> 32)).anInt4428 / 2;
+						local1226 = Static271.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2;
 					}
-					if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+					if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 						local1950 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);
 						if (GlRenderer.enabled && local330) {
 							Static242.method4211(local1950.aClass36_Sub1_3, local165 - Static114.anIntArray565[arg9] * 8, local201, local173 - Static64.anIntArray154[arg9] * 8);
@@ -379,7 +379,7 @@ public final class Static185 {
 					Static91.method1880(arg2, arg7, arg8, local199, local1934, null, 256, arg9, local1226 * Static114.anIntArray565[arg9], local1226 * Static64.anIntArray154[arg9], local261);
 				} else if (arg6 == 7) {
 					@Pc(2137) int local2137 = arg9 + 2 & 0x3;
-					if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+					if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 						@Pc(2183) Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);
 						if (GlRenderer.enabled && local330) {
 							Static242.method4211(local2183.aClass36_Sub1_3, local165, local201, local173);
@@ -393,11 +393,11 @@ public final class Static185 {
 					local1226 = 8;
 					local1889 = Static265.method4521(arg2, arg7, arg8);
 					if (local1889 != 0L) {
-						local1226 = Static271.method4601(Integer.MAX_VALUE & (int) (local1889 >>> 32)).anInt4428 / 2;
+						local1226 = Static271.get(Integer.MAX_VALUE & (int) (local1889 >>> 32)).wallDecorOffsetScale / 2;
 					}
 					@Pc(2244) int local2244 = arg9 + 2 & 0x3;
 					@Pc(2289) Entity local2289;
-					if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
+					if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) {
 						@Pc(2297) int local2297 = Static64.anIntArray154[arg9] * 8;
 						@Pc(2303) int local2303 = Static114.anIntArray565[arg9] * 8;
 						@Pc(2319) Class139 local2319 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173);

client/src/main/java/Static186.java

@@ -165,7 +165,7 @@ public final class Static186 {
 	@OriginalMember(owner = "client!pa", name = "a", descriptor = "(IIILclient!e;)V")
 	public static void method3415(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2) {
 		if (arg1 == arg2.anInt3369 && arg1 != -1) {
-			@Pc(89) SeqType local89 = Static36.method941(arg1);
+			@Pc(89) SeqType local89 = Static36.get(arg1);
 			@Pc(92) int local92 = local89.anInt5347;
 			if (local92 == 1) {
 				arg2.anInt3420 = arg0;
@@ -178,7 +178,7 @@ public final class Static186 {
 			if (local92 == 2) {
 				arg2.anInt3371 = 0;
 			}
-		} else if (arg1 == -1 || arg2.anInt3369 == -1 || Static36.method941(arg1).anInt5355 >= Static36.method941(arg2.anInt3369).anInt5355) {
+		} else if (arg1 == -1 || arg2.anInt3369 == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.anInt3369).anInt5355) {
 			arg2.anInt3373 = 1;
 			arg2.anInt3425 = 0;
 			arg2.anInt3420 = arg0;
@@ -187,7 +187,7 @@ public final class Static186 {
 			arg2.anInt3360 = 0;
 			arg2.anInt3369 = arg1;
 			if (arg2.anInt3369 != -1) {
-				Static152.method2836(arg2.zFine, Static36.method941(arg2.anInt3369), arg2.xFine, arg2 == Static173.self, arg2.anInt3425);
+				Static152.method2836(arg2.zFine, Static36.get(arg2.anInt3369), arg2.xFine, arg2 == Static173.self, arg2.anInt3425);
 			}
 		}
 	}

client/src/main/java/Static190.java

@@ -57,7 +57,7 @@ public final class Static190 {
 	@OriginalMember(owner = "client!pf", name = "c", descriptor = "(II)V")
 	public static void method3447() {
 		Static27.aClass99_4.method3102(5);
-		Static244.aClass99_32.method3102(5);
+		Static244.models.method3102(5);
 		Static118.objectSpriteCache.method3102(5);
 	}
 }

client/src/main/java/Static192.java

@@ -27,17 +27,17 @@ public final class Static192 {
 				local40 = Static175.npcs[local29];
 			}
 			if (local40 != null) {
-				@Pc(63) LocType local63 = Static271.method4601(local17.anInt1189);
+				@Pc(63) LocType local63 = Static271.get(local17.anInt1189);
 				if (Static55.level < 3) {
 				}
 				@Pc(86) int local86;
 				@Pc(83) int local83;
 				if (local17.anInt1206 == 1 || local17.anInt1206 == 3) {
-					local83 = local63.anInt4397;
+					local83 = local63.width;
-					local86 = local63.anInt4403;
+					local86 = local63.length;
 				} else {
-					local86 = local63.anInt4397;
+					local86 = local63.width;
-					local83 = local63.anInt4403;
+					local83 = local63.length;
 				}
 				@Pc(103) int local103 = (local86 + 1 >> 1) + local17.anInt1190;
 				@Pc(110) int local110 = (local86 >> 1) + local17.anInt1190;

client/src/main/java/Static202.java

@@ -25,7 +25,7 @@ public final class Static202 {
 	@OriginalMember(owner = "client!qg", name = "h", descriptor = "(I)V")
 	public static void method3653() {
 		Static231.aClass99_29.clear();
-		Static219.aClass99_27.clear();
+		Static219.sprites.clear();
 	}
 
 	@OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V")
@@ -98,9 +98,9 @@ public final class Static202 {
 	@OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V")
 	public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(7) VarbitType local7 = Static125.method2449(arg0);
-		@Pc(10) int local10 = local7.anInt3323;
+		@Pc(10) int local10 = local7.endBit;
-		@Pc(16) int local16 = local7.anInt3318;
+		@Pc(16) int local16 = local7.startBit;
-		@Pc(19) int local19 = local7.anInt3327;
+		@Pc(19) int local19 = local7.baseVar;
 		@Pc(25) int local25 = Class3_Sub9.anIntArray135[local10 - local16];
 		if (arg1 < 0 || arg1 > local25) {
 			arg1 = 0;

client/src/main/java/Static204.java

@@ -35,7 +35,7 @@ public final class Static204 {
 	public static void method3673() {
 		Static93.aClass99_13.clear();
 		Static125.aClass99_18.clear();
-		Static262.aClass99_35.clear();
+		Static262.headModels.clear();
 	}
 
 	@OriginalMember(owner = "client!qi", name = "b", descriptor = "(II)I")

client/src/main/java/Static209.java

@@ -46,7 +46,7 @@ public final class Static209 {
 	public static void method3706() {
 		Static93.aClass99_13.method3102(5);
 		Static125.aClass99_18.method3102(5);
-		Static262.aClass99_35.method3102(5);
+		Static262.headModels.method3102(5);
 	}
 
 	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BIII)V")

client/src/main/java/Static211.java

@@ -33,7 +33,7 @@ public final class Static211 {
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(Z)V")
 	public static void method924() {
-		Static244.aClass99_32.clear();
+		Static244.models.clear();
 	}
 
 	@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")

client/src/main/java/Static214.java

@@ -55,16 +55,16 @@ public final class Static214 {
 	}
 
 	@OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;")
-	public static NpcType method4363(@OriginalArg(0) int arg0) {
+	public static NpcType get(@OriginalArg(0) int arg0) {
 		@Pc(10) NpcType local10 = (NpcType) Static93.aClass99_13.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
 		@Pc(26) byte[] local26 = Static58.aClass153_28.getFile(Static60.method1447(arg0), Static179.method3322(arg0));
 		local10 = new NpcType();
-		local10.anInt3741 = arg0;
+		local10.id = arg0;
 		if (local26 != null) {
-			local10.method2939(new Buffer(local26));
+			local10.decode(new Buffer(local26));
 		}
 		local10.method2942();
 		Static93.aClass99_13.put(local10, (long) arg0);

client/src/main/java/Static217.java

@@ -58,7 +58,7 @@ public final class Static217 {
 			for (local275 = 7; local275 >= 0; local275--) {
 				if (Static160.aClass100Array121[local275] != null) {
 					@Pc(291) short local291 = 0;
-					if (Static266.game == 0 && Static160.aClass100Array121[local275].method3111(LocalizedText.ATTACK)) {
+					if (Static266.game == 0 && Static160.aClass100Array121[local275].equalsIgnoreCase(LocalizedText.ATTACK)) {
 						if (arg2.anInt1652 > Static173.self.anInt1652) {
 							local291 = 2000;
 						}
@@ -157,9 +157,9 @@ public final class Static217 {
 				@Pc(68) int local68 = local64 >> 2;
 				@Pc(72) int local72 = local64 & 0x3;
 				if (arg3 == local60 && local56 >= arg8 && local56 < arg8 + 8 && arg9 <= local50 && arg9 + 8 > local50) {
-					@Pc(103) LocType local103 = Static271.method4601(local7);
+					@Pc(103) LocType local103 = Static271.get(local7);
-					@Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.anInt4403, local103.anInt4397, local56 & 0x7) + arg5;
+					@Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.length, local103.width, local56 & 0x7) + arg5;
-					@Pc(137) int local137 = Static241.method4541(local103.anInt4397, arg4, local103.anInt4403, local56 & 0x7, local72, local50 & 0x7) + arg6;
+					@Pc(137) int local137 = Static241.method4541(local103.width, arg4, local103.length, local56 & 0x7, local72, local50 & 0x7) + arg6;
 					if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) {
 						@Pc(154) CollisionMap local154 = null;
 						if (!arg7) {

client/src/main/java/Static219.java

@@ -7,7 +7,7 @@ public final class Static219 {
 	public static Sprite[] aClass3_Sub2_Sub1Array9;
 
 	@OriginalMember(owner = "client!rl", name = "P", descriptor = "Lclient!n;")
-	public static final SoftLruHashTable aClass99_27 = new SoftLruHashTable(64);
+	public static final SoftLruHashTable sprites = new SoftLruHashTable(64);
 
 	@OriginalMember(owner = "client!rl", name = "S", descriptor = "Lclient!na;")
 	public static final JagString aClass100_920 = Static28.parse("hitmarks");

client/src/main/java/Static220.java

@@ -27,9 +27,9 @@ public final class Static220 {
 		@Pc(30) ObjStackNode local30 = null;
 		@Pc(35) ObjStackNode local35;
 		for (local35 = (ObjStackNode) local9.method2289(); local35 != null; local35 = (ObjStackNode) local9.method2288()) {
-			@Pc(44) ObjType local44 = Static71.method1439(local35.aClass8_Sub7_1.anInt5555);
+			@Pc(44) ObjType local44 = Static71.get(local35.aClass8_Sub7_1.anInt5555);
-			@Pc(47) int local47 = local44.anInt2325;
+			@Pc(47) int local47 = local44.cost;
-			if (local44.anInt2336 == 1) {
+			if (local44.stackable == 1) {
 				local47 *= local35.aClass8_Sub7_1.anInt5550 + 1;
 			}
 			if (local28 < local47) {
@@ -72,11 +72,11 @@ public final class Static220 {
 		@Pc(4) long local4 = (long) arg2;
 		@Pc(10) Model local10 = (Model) Static110.aClass99_15.get(local4);
 		if (local10 == null) {
-			@Pc(22) RawModel local22 = Static77.method1686(Static267.js5Archive7, arg2);
+			@Pc(22) RawModel local22 = Static77.create(Static267.js5Archive7, arg2);
 			if (local22 == null) {
 				return null;
 			}
-			local10 = local22.method1679(64, 768, -50, -10, -50);
+			local10 = local22.createModel(64, 768, -50, -10, -50);
 			Static110.aClass99_15.put(local10, local4);
 		}
 		@Pc(42) int local42 = arg4.method4562();

client/src/main/java/Static223.java

@@ -35,7 +35,7 @@ public final class Static223 {
 	@OriginalMember(owner = "client!sc", name = "a", descriptor = "(IIILclient!km;)V")
 	public static void method3855(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Npc arg2) {
 		if (arg2.anInt3369 == arg1 && arg1 != -1) {
-			@Pc(10) SeqType local10 = Static36.method941(arg1);
+			@Pc(10) SeqType local10 = Static36.get(arg1);
 			@Pc(13) int local13 = local10.anInt5347;
 			if (local13 == 1) {
 				arg2.anInt3373 = 1;
@@ -48,7 +48,7 @@ public final class Static223 {
 			if (local13 == 2) {
 				arg2.anInt3371 = 0;
 			}
-		} else if (arg1 == -1 || arg2.anInt3369 == -1 || Static36.method941(arg1).anInt5355 >= Static36.method941(arg2.anInt3369).anInt5355) {
+		} else if (arg1 == -1 || arg2.anInt3369 == -1 || Static36.get(arg1).anInt5355 >= Static36.get(arg2.anInt3369).anInt5355) {
 			arg2.anInt3360 = 0;
 			arg2.anInt3369 = arg1;
 			arg2.anInt3373 = 1;
@@ -57,7 +57,7 @@ public final class Static223 {
 			arg2.anInt3405 = arg2.movementQueueSize;
 			arg2.anInt3425 = 0;
 			if (arg2.anInt3369 != -1) {
-				Static152.method2836(arg2.zFine, Static36.method941(arg2.anInt3369), arg2.xFine, false, arg2.anInt3425);
+				Static152.method2836(arg2.zFine, Static36.get(arg2.anInt3369), arg2.xFine, false, arg2.anInt3425);
 			}
 		}
 	}

client/src/main/java/Static230.java

@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static230 {
 
 	@OriginalMember(owner = "client!sj", name = "r", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_95;
+	public static Js5 modelsArchive;
 
 	@OriginalMember(owner = "client!sj", name = "D", descriptor = "I")
 	public static int anInt5158;

client/src/main/java/Static232.java

@@ -56,7 +56,7 @@ public final class Static232 {
 								@Pc(203) int local203 = (local50 + arg4 & 0x3F) + ((arg6 + local119 & 0x3F) << 6);
 								@Pc(209) int local209 = local116[local163][local203];
 								if (local209 != 0) {
-									@Pc(222) LocType local222 = Static271.method4601(local209 - 1);
+									@Pc(222) LocType local222 = Static271.get(local209 - 1);
 									if (!Static258.aBooleanArray130[local222.anInt4400]) {
 										if (local11 != -1 && local222.anInt4400 == Static9.anInt172) {
 											@Pc(243) Class3_Sub26 local243 = new Class3_Sub26();

client/src/main/java/Static233.java

@@ -77,7 +77,7 @@ public final class Static233 {
 	public static void method4001() {
 		Static93.aClass99_13.method3103();
 		Static125.aClass99_18.method3103();
-		Static262.aClass99_35.method3103();
+		Static262.headModels.method3103();
 	}
 
 	@OriginalMember(owner = "client!t", name = "a", descriptor = "(ZB)V")
@@ -122,17 +122,17 @@ public final class Static233 {
 		@Pc(24) int local24 = (int) arg0 >> 20 & 0x3;
 		@Pc(31) int local31 = (int) (arg0 >>> 32) & Integer.MAX_VALUE;
 		if (local12 == 10 || local12 == 11 || local12 == 22) {
-			@Pc(46) LocType local46 = Static271.method4601(local31);
+			@Pc(46) LocType local46 = Static271.get(local31);
 			@Pc(62) int local62;
 			@Pc(59) int local59;
 			if (local24 == 0 || local24 == 2) {
-				local59 = local46.anInt4403;
+				local59 = local46.length;
-				local62 = local46.anInt4397;
+				local62 = local46.width;
 			} else {
-				local59 = local46.anInt4397;
+				local59 = local46.width;
-				local62 = local46.anInt4403;
+				local62 = local46.length;
 			}
-			@Pc(73) int local73 = local46.anInt4433;
+			@Pc(73) int local73 = local46.blockedSides;
 			if (local24 != 0) {
 				local73 = (local73 << local24 & 0xF) + (local73 >> 4 - local24);
 			}

client/src/main/java/Static234.java

@@ -60,7 +60,7 @@ public final class Static234 {
 				}
 				local47 = Static57.aClass3_Sub15_Sub1_3.g4me();
 				@Pc(147) boolean local147 = true;
-				if (local43 != -1 && local14.anInt3432 != -1 && Static36.method941(Static34.method877(local43).anInt1754).anInt5355 < Static36.method941(Static34.method877(local14.anInt3432).anInt1754).anInt5355) {
+				if (local43 != -1 && local14.anInt3432 != -1 && Static36.get(Static34.method877(local43).seqId).anInt5355 < Static36.get(Static34.method877(local14.anInt3432).seqId).anInt5355) {
 					local147 = false;
 				}
 				if (local147) {
@@ -74,10 +74,10 @@ public final class Static234 {
 						local14.anInt3399 = -1;
 					}
 					if (local14.anInt3432 != -1 && local14.anInt3359 == Static83.loop) {
-						@Pc(227) int local227 = Static34.method877(local14.anInt3432).anInt1754;
+						@Pc(227) int local227 = Static34.method877(local14.anInt3432).seqId;
 						if (local227 != -1) {
-							@Pc(236) SeqType local236 = Static36.method941(local227);
+							@Pc(236) SeqType local236 = Static36.get(local227);
-							if (local236 != null && local236.anIntArray473 != null) {
+							if (local236 != null && local236.frames != null) {
 								Static152.method2836(local14.zFine, local236, local14.xFine, false, 0);
 							}
 						}
@@ -85,13 +85,13 @@ public final class Static234 {
 				}
 			}
 			if ((local18 & 0x1) != 0) {
-				if (local14.type.method2935()) {
+				if (local14.type.hasAreaSound()) {
 					Static91.method1877(local14);
 				}
-				local14.method2698(Static214.method4363(Static57.aClass3_Sub15_Sub1_3.g2le()));
+				local14.method2698(Static214.get(Static57.aClass3_Sub15_Sub1_3.g2le()));
-				local14.method2692(local14.type.anInt3713);
+				local14.method2692(local14.type.soze);
-				local14.anInt3365 = local14.type.anInt3737;
+				local14.anInt3365 = local14.type.basId;
-				if (local14.type.method2935()) {
+				if (local14.type.hasAreaSound()) {
 					Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Static55.level, null);
 				}
 			}

client/src/main/java/Static238.java

@@ -34,7 +34,7 @@ public final class Static238 {
 			return false;
 		}
 		for (@Pc(11) int local11 = 0; local11 < Static35.anInt1093; local11++) {
-			if (arg0.method3111(Static193.aClass100Array134[local11])) {
+			if (arg0.equalsIgnoreCase(Static193.aClass100Array134[local11])) {
 				return true;
 			}
 		}

client/src/main/java/Static241.java

@@ -82,7 +82,7 @@ public final class Static241 {
 	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZBLclient!ve;Lclient!dd;Lclient!ve;)V")
 	public static void init(@OriginalArg(2) Js5 arg0, @OriginalArg(3) SoftwareFont arg1, @OriginalArg(4) Js5 arg2) {
 		Static240.aBoolean276 = true;
-		Static230.aClass153_95 = arg2;
+		Static230.modelsArchive = arg2;
 		Static167.aClass153_61 = arg0;
 		@Pc(23) int local23 = Static167.aClass153_61.method4483() - 1;
 		Static170.anInt3245 = Static167.aClass153_61.method4504(local23) + local23 * 256;

client/src/main/java/Static242.java

@@ -26,7 +26,7 @@ public final class Static242 {
 		arg3 += arg0.anInt4273;
 		@Pc(16) int local16 = arg2 + arg3 * arg1.width;
 		@Pc(18) int local18 = 0;
-		@Pc(21) int local21 = arg0.anInt4278;
+		@Pc(21) int local21 = arg0.height;
 		@Pc(24) int local24 = arg0.width;
 		@Pc(29) int local29 = arg1.width - local24;
 		@Pc(31) int local31 = 0;
@@ -38,8 +38,8 @@ public final class Static242 {
 			local16 += local37 * arg1.width;
 			arg3 = 1;
 		}
-		if (arg3 + local21 >= arg1.anInt4278) {
+		if (arg3 + local21 >= arg1.height) {
-			local37 = arg3 + local21 + 1 - arg1.anInt4278;
+			local37 = arg3 + local21 + 1 - arg1.height;
 			local21 -= local37;
 		}
 		if (arg2 <= 0) {
@@ -187,7 +187,7 @@ public final class Static242 {
 		arg2 += arg0.anInt4280;
 		arg3 += arg0.anInt4273;
 		@Pc(16) int local16 = arg2 + arg3 * arg1.width;
-		@Pc(19) int local19 = arg0.anInt4278;
+		@Pc(19) int local19 = arg0.height;
 		@Pc(22) int local22 = arg0.width;
 		@Pc(27) int local27 = arg1.width - local22;
 		@Pc(33) int local33;
@@ -197,8 +197,8 @@ public final class Static242 {
 			local16 += local33 * arg1.width;
 			arg3 = 1;
 		}
-		if (arg3 + local19 >= arg1.anInt4278) {
+		if (arg3 + local19 >= arg1.height) {
-			local33 = arg3 + local19 + 1 - arg1.anInt4278;
+			local33 = arg3 + local19 + 1 - arg1.height;
 			local19 -= local33;
 		}
 		if (arg2 <= 0) {
@@ -241,7 +241,7 @@ public final class Static242 {
 		arg3 += arg0.anInt4273;
 		@Pc(16) int local16 = arg2 + arg3 * arg1.width;
 		@Pc(18) int local18 = 0;
-		@Pc(21) int local21 = arg0.anInt4278;
+		@Pc(21) int local21 = arg0.height;
 		@Pc(24) int local24 = arg0.width;
 		@Pc(29) int local29 = arg1.width - local24;
 		@Pc(31) int local31 = 0;
@@ -253,8 +253,8 @@ public final class Static242 {
 			local16 += local37 * arg1.width;
 			arg3 = 1;
 		}
-		if (arg3 + local21 >= arg1.anInt4278) {
+		if (arg3 + local21 >= arg1.height) {
-			local37 = arg3 + local21 + 1 - arg1.anInt4278;
+			local37 = arg3 + local21 + 1 - arg1.height;
 			local21 -= local37;
 		}
 		if (arg2 <= 0) {
@@ -377,7 +377,7 @@ public final class Static242 {
 
 	@OriginalMember(owner = "client!tj", name = "a", descriptor = "(Lclient!ek;Lclient!ek;IIIZ)V")
 	private static void method4210(@OriginalArg(0) SoftwareIndexedSprite arg0, @OriginalArg(1) SoftwareIndexedSprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) {
-		if (arg2 <= 0 || arg3 <= 0 || arg2 + 16 >= arg1.width || arg3 + 16 >= arg1.anInt4278) {
+		if (arg2 <= 0 || arg3 <= 0 || arg2 + 16 >= arg1.width || arg3 + 16 >= arg1.height) {
 			return;
 		}
 		@Pc(23) int local23 = arg2 + arg3 * arg1.width;

client/src/main/java/Static244.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static244 {
 
 	@OriginalMember(owner = "client!tl", name = "c", descriptor = "Lclient!n;")
-	public static final SoftLruHashTable aClass99_32 = new SoftLruHashTable(50);
+	public static final SoftLruHashTable models = new SoftLruHashTable(50);
 
 	@OriginalMember(owner = "client!tl", name = "d", descriptor = "I")
 	public static int gameState = 0;

client/src/main/java/Static246.java

@@ -41,33 +41,33 @@ public final class Static246 {
 		if (Static231.anInt5204 >= 400) {
 			return;
 		}
-		if (arg0.anIntArray357 != null) {
+		if (arg0.multiNpcs != null) {
 			arg0 = arg0.getMultiNpc();
 		}
 		if (arg0 == null || !arg0.aBoolean183) {
 			return;
 		}
-		@Pc(35) JagString local35 = arg0.aClass100_738;
+		@Pc(35) JagString local35 = arg0.name;
-		if (arg0.anInt3726 != 0) {
+		if (arg0.combatLevel != 0) {
 			@Pc(47) JagString local47 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
-			local35 = Static34.concatenate(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.parseInt(arg0.anInt3726), Static72.aClass100_448 });
+			local35 = Static34.concatenate(new JagString[] { local35, Static123.method2420(arg0.combatLevel, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.parseInt(arg0.combatLevel), Static72.aClass100_448 });
 		}
 		if (Static260.anInt5014 == 1) {
 			Static98.method1966(Static169.anInt4075, (long) arg2, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
 		} else if (Static241.aBoolean302) {
 			@Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
-			if ((Static274.anInt4999 & 0x2) != 0 && (local378 == null || arg0.method2936(Static121.anInt3039, local378.anInt2667) != local378.anInt2667)) {
+			if ((Static274.anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) {
 				Static98.method1966(anInt5393, (long) arg2, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, Static102.aClass100_545, arg3);
 			}
 		} else {
-			@Pc(129) JagString[] local129 = arg0.aClass100Array116;
+			@Pc(129) JagString[] local129 = arg0.ops;
 			if (Static208.aBoolean237) {
 				local129 = Static279.method4664(local129);
 			}
 			@Pc(140) int local140;
 			if (local129 != null) {
 				for (local140 = 4; local140 >= 0; local140--) {
-					if (local129[local140] != null && (Static266.game != 0 || !local129[local140].method3111(LocalizedText.ATTACK))) {
+					if (local129[local140] != null && (Static266.game != 0 || !local129[local140].equalsIgnoreCase(LocalizedText.ATTACK))) {
 						@Pc(161) byte local161 = 0;
 						if (local140 == 0) {
 							local161 = 17;
@@ -82,11 +82,11 @@ public final class Static246 {
 						if (local140 == 3) {
 							local161 = 19;
 						}
-						if (arg0.anInt3750 == local140) {
+						if (arg0.cursor1Op == local140) {
-							local176 = arg0.anInt3719;
+							local176 = arg0.cursor1;
 						}
-						if (local140 == arg0.anInt3743) {
+						if (local140 == arg0.cursor2Op) {
-							local176 = arg0.anInt3735;
+							local176 = arg0.cursor2;
 						}
 						if (local140 == 4) {
 							local161 = 2;
@@ -97,9 +97,9 @@ public final class Static246 {
 			}
 			if (Static266.game == 0 && local129 != null) {
 				for (local140 = 4; local140 >= 0; local140--) {
-					if (local129[local140] != null && local129[local140].method3111(LocalizedText.ATTACK)) {
+					if (local129[local140] != null && local129[local140].equalsIgnoreCase(LocalizedText.ATTACK)) {
 						@Pc(271) short local271 = 0;
-						if (arg0.anInt3726 > Static173.self.anInt1652) {
+						if (arg0.combatLevel > Static173.self.anInt1652) {
 							local271 = 2000;
 						}
 						@Pc(281) short local281 = 0;

client/src/main/java/Static247.java

@@ -691,7 +691,7 @@ public final class Static247 {
 		@Pc(20) byte[] local20 = Static81.aClass153_34.getFile(16, arg0);
 		local10 = new VarpType();
 		if (local20 != null) {
-			local10.method1323(new Buffer(local20));
+			local10.decode(new Buffer(local20));
 		}
 		Static232.aClass99_30.put(local10, (long) arg0);
 		return local10;
@@ -700,6 +700,6 @@ public final class Static247 {
 	@OriginalMember(owner = "client!ub", name = "a", descriptor = "(Z)V")
 	public static void method4249() {
 		Static279.aClass99_38.clear();
-		Static56.aClass99_9.clear();
+		Static56.models.clear();
 	}
 }

client/src/main/java/Static250.java

@@ -10,7 +10,7 @@ public final class Static250 {
 	public static int anInt5443;
 
 	@OriginalMember(owner = "client!uf", name = "r", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_101;
+	public static Js5 spritesArchive;
 
 	@OriginalMember(owner = "client!uf", name = "b", descriptor = "Z")
 	public static boolean showGroundDecorations = true;

client/src/main/java/Static258.java

@@ -59,18 +59,18 @@ public final class Static258 {
 						Static18.anInt588 = local171;
 						if (arg2.objTypes[local171] > 0) {
 							@Pc(267) ServerActiveProperties local267 = Static36.method940(arg2);
-							@Pc(276) ObjType local276 = Static71.method1439(arg2.objTypes[local171] - 1);
+							@Pc(276) ObjType local276 = Static71.get(arg2.objTypes[local171] - 1);
 							if (Static260.anInt5014 == 1 && local267.method510()) {
 								if (Static224.anInt5062 != arg2.id || Static185.anInt4370 != local171) {
-									Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 40, LocalizedText.USE, arg2.id);
+									Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, arg2.id);
 								}
 							} else if (Static241.aBoolean302 && local267.method510()) {
 								@Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
-								if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.method1829(local596.anInt2667, Static121.anInt3039) != local596.anInt2667)) {
+								if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) {
-									Static98.method1966(Static246.anInt5393, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 3, Static102.aClass100_545, arg2.id);
+									Static98.method1966(Static246.anInt5393, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local276.name}), local171, (short) 3, Static102.aClass100_545, arg2.id);
 								}
 							} else {
-								@Pc(296) JagString[] local296 = local276.aClass100Array71;
+								@Pc(296) JagString[] local296 = local276.inventoryOps;
 								if (Static208.aBoolean237) {
 									local296 = Static279.method4664(local296);
 								}
@@ -84,12 +84,12 @@ public final class Static258 {
 											} else {
 												local334 = 58;
 											}
-											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.id);
+											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id);
 										}
 									}
 								}
 								if (local267.method507()) {
-									Static98.method1966(Static169.anInt4075, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, (short) 22, LocalizedText.USE, arg2.id);
+									Static98.method1966(Static169.anInt4075, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, arg2.id);
 								}
 								if (local267.method510() && local296 != null) {
 									for (local309 = 2; local309 >= 0; local309--) {
@@ -104,7 +104,7 @@ public final class Static258 {
 											if (local309 == 2) {
 												local334 = 43;
 											}
-											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.id);
+											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id);
 										}
 									}
 								}
@@ -131,11 +131,11 @@ public final class Static258 {
 											if (local309 == 4) {
 												local334 = 13;
 											}
-											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.id);
+											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], arg2.id);
 										}
 									}
 								}
-								Static98.method1966(Static225.anInt5073, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, (short) 1006, LocalizedText.EXAMINE, arg2.id);
+								Static98.method1966(Static225.anInt5073, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, arg2.id);
 							}
 						}
 					}

client/src/main/java/Static262.java

@@ -17,7 +17,7 @@ public final class Static262 {
 	public static final int[] anIntArray515 = new int[14];
 
 	@OriginalMember(owner = "client!vf", name = "k", descriptor = "Lclient!n;")
-	public static final SoftLruHashTable aClass99_35 = new SoftLruHashTable(5);
+	public static final SoftLruHashTable headModels = new SoftLruHashTable(5);
 
 	@OriginalMember(owner = "client!vf", name = "l", descriptor = "Lclient!n;")
 	public static final SoftLruHashTable aClass99_36 = new SoftLruHashTable(50);

client/src/main/java/Static266.java

@@ -8,7 +8,7 @@ public final class Static266 {
 	public static byte[][][] aByteArrayArrayArray15;
 
 	@OriginalMember(owner = "client!vk", name = "o", descriptor = "I")
-	public static int anInt5344;
+	public static int blueDelta;
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "[I")
 	public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 };
@@ -27,7 +27,7 @@ public final class Static266 {
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V")
 	public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
-		Static93.aClass153_41 = arg0;
+		Static93.modelsArchive = arg0;
 		Static132.aClass153_48 = arg1;
 	}
 

client/src/main/java/Static267.java

@@ -148,6 +148,6 @@ public final class Static267 {
 	@OriginalMember(owner = "client!vl", name = "b", descriptor = "(I)V")
 	public static void method4529() {
 		Static231.aClass99_29.method3103();
-		Static219.aClass99_27.method3103();
+		Static219.sprites.method3103();
 	}
 }

client/src/main/java/Static271.java

@@ -45,7 +45,7 @@ public final class Static271 {
 	}
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;")
-	public static LocType method4601(@OriginalArg(1) int arg0) {
+	public static LocType get(@OriginalArg(1) int arg0) {
 		@Pc(15) LocType local15 = (LocType) Static179.aClass99_25.get((long) arg0);
 		if (local15 != null) {
 			return local15;
@@ -54,11 +54,11 @@ public final class Static271 {
 		local15 = new LocType();
 		local15.anInt4426 = arg0;
 		if (local30 != null) {
-			local15.method3424(new Buffer(local30));
+			local15.decode(new Buffer(local30));
 		}
-		local15.method3421();
+		local15.postDecode();
-		if (!Static30.aBoolean61 && local15.aBoolean208) {
+		if (!Static30.aBoolean61 && local15.members) {
-			local15.aClass100Array130 = null;
+			local15.ops = null;
 		}
 		if (local15.aBoolean210) {
 			local15.anInt4435 = 0;

client/src/main/java/Static272.java

@@ -22,9 +22,9 @@ public final class Static272 {
 	@OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
 	public static void method3995(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(14) VarbitType local14 = Static125.method2449(arg1);
-		@Pc(17) int local17 = local14.anInt3327;
+		@Pc(17) int local17 = local14.baseVar;
-		@Pc(20) int local20 = local14.anInt3323;
+		@Pc(20) int local20 = local14.endBit;
-		@Pc(23) int local23 = local14.anInt3318;
+		@Pc(23) int local23 = local14.startBit;
 		@Pc(29) int local29 = Class3_Sub9.anIntArray135[local20 - local23];
 		if (arg0 < 0 || local29 < arg0) {
 			arg0 = 0;

client/src/main/java/Static273.java

@@ -65,7 +65,7 @@ public final class Static273 {
 					@Pc(131) int local131 = local124 + local33[local39++];
 					local135 = Static5.getComponent(local131);
 					local140 = local33[local39++];
-					if (local140 != -1 && (!Static71.method1439(local140).aBoolean131 || Static2.aBoolean1)) {
+					if (local140 != -1 && (!Static71.get(local140).members || Static2.aBoolean1)) {
 						for (local152 = 0; local152 < local135.objTypes.length; local152++) {
 							if (local140 + 1 == local135.objTypes[local152]) {
 								local41 += local135.objCounts[local152];
@@ -97,7 +97,7 @@ public final class Static273 {
 					local124 += local33[local39++];
 					local135 = Static5.getComponent(local124);
 					local140 = local33[local39++];
-					if (local140 != -1 && (!Static71.method1439(local140).aBoolean131 || Static2.aBoolean1)) {
+					if (local140 != -1 && (!Static71.get(local140).members || Static2.aBoolean1)) {
 						for (local152 = 0; local152 < local135.objTypes.length; local152++) {
 							if (local135.objTypes[local152] == local140 + 1) {
 								local41 = 999999999;

client/src/main/java/Static274.java

@@ -19,7 +19,7 @@ public final class Static274 {
 	public static Component staticActiveComponent1;
 
 	@OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;")
-	public static final RawModel[] aClass8_Sub5Array5 = new RawModel[4];
+	public static final RawModel[] tempModels = new RawModel[4];
 
 	@OriginalMember(owner = "client!wf", name = "s", descriptor = "Lclient!na;")
 	public static final JagString aClass100_943 = Static28.parse("Forced tweening disabled)3");

client/src/main/java/Static276.java

@@ -53,7 +53,7 @@ public final class Static276 {
 		@Pc(13) boolean local13 = false;
 		for (@Pc(15) int local15 = 0; local15 < Static267.anInt5774; local15++) {
 			@Pc(28) Player local28 = Static159.players[Static105.anIntArray256[local15]];
-			if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.method3111(local7)) {
+			if (local28 != null && local28.aClass100_364 != null && local28.aClass100_364.equalsIgnoreCase(local7)) {
 				local13 = true;
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local28.movementQueueX[0], 1, 0, 2, local28.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				if (arg0 == 1) {
@@ -95,6 +95,6 @@ public final class Static276 {
 	@OriginalMember(owner = "client!wh", name = "a", descriptor = "(II)V")
 	public static void method4615() {
 		Static231.aClass99_29.method3102(5);
-		Static219.aClass99_27.method3102(5);
+		Static219.sprites.method3102(5);
 	}
 }

client/src/main/java/Static278.java

@@ -30,7 +30,7 @@ public final class Static278 {
 					@Pc(37) Npc local37 = Static175.npcs[local14];
 					Static33.anIntArray79[Static272.anInt5214++] = local14;
 					local37.anInt3430 = Static83.loop;
-					if (local37.type != null && local37.type.method2935()) {
+					if (local37.type != null && local37.type.hasAreaSound()) {
 						Static91.method1877(local37);
 					}
 					@Pc(66) int local66 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
@@ -43,7 +43,7 @@ public final class Static278 {
 						Static44.anIntArray106[Static116.anInt2951++] = local14;
 					}
 					@Pc(105) int local105 = Static57.aClass3_Sub15_Sub1_3.method2238(5);
-					local37.method2698(Static214.method4363(Static57.aClass3_Sub15_Sub1_3.method2238(14)));
+					local37.method2698(Static214.get(Static57.aClass3_Sub15_Sub1_3.method2238(14)));
 					if (local105 > 15) {
 						local105 -= 32;
 					}
@@ -51,14 +51,14 @@ public final class Static278 {
 					if (local124 > 15) {
 						local124 -= 32;
 					}
-					local37.method2692(local37.type.anInt3713);
+					local37.method2692(local37.type.soze);
-					local37.anInt3365 = local37.type.anInt3737;
+					local37.anInt3365 = local37.type.basId;
 					local37.anInt3376 = local37.type.anInt3733;
 					if (local37.anInt3376 == 0) {
 						local37.anInt3381 = 0;
 					}
 					local37.method2683(local37.getSize(), Static173.self.movementQueueX[0] + local124, local105 + Static173.self.movementQueueZ[0], local66 == 1);
-					if (local37.type.method2935()) {
+					if (local37.type.hasAreaSound()) {
 						Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Static55.level, null);
 					}
 					continue;

client/src/main/java/Static280.java

@@ -24,7 +24,7 @@ public final class Static280 {
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V")
 	public static void method4665(@OriginalArg(0) PathingEntity arg0) {
-		if (Static83.loop == arg0.anInt3386 || arg0.anInt3369 == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.method941(arg0.anInt3369).anIntArray474[arg0.anInt3425]) {
+		if (Static83.loop == arg0.anInt3386 || arg0.anInt3369 == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.get(arg0.anInt3369).anIntArray474[arg0.anInt3425]) {
 			@Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395;
 			@Pc(41) int local41 = Static83.loop - arg0.anInt3395;
 			@Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64;

client/src/main/java/Static32.java

@@ -25,7 +25,7 @@ public final class Static32 {
 					if (local20 == -1) {
 						arg2.aClass147Array3[local30] = null;
 					} else {
-						@Pc(68) SeqType local68 = Static36.method941(local20);
+						@Pc(68) SeqType local68 = Static36.get(local20);
 						@Pc(71) int local71 = local68.anInt5347;
 						@Pc(76) Class147 local76 = arg2.aClass147Array3[local30];
 						if (local76 != null) {
@@ -42,7 +42,7 @@ public final class Static32 {
 								} else if (local71 == 2) {
 									local76.anInt5400 = 0;
 								}
-							} else if (local68.anInt5355 >= Static36.method941(local76.anInt5396).anInt5355) {
+							} else if (local68.anInt5355 >= Static36.get(local76.anInt5396).anInt5355) {
 								local76 = arg2.aClass147Array3[local30] = null;
 							}
 						}

client/src/main/java/Static33.java

@@ -19,28 +19,28 @@ public final class Static33 {
 
 	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ILclient!pb;ZIIII)Z")
 	public static boolean method867(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) {
-		@Pc(10) MsiType local10 = Static40.method1013(arg1.anInt4415);
+		@Pc(10) MsiType local10 = Static40.method1013(arg1.mapSceneId);
-		if (local10.anInt12 == -1) {
+		if (local10.spriteId == -1) {
 			return true;
 		}
-		if (arg1.aBoolean218) {
+		if (arg1.mapSceneRotated) {
-			@Pc(24) int local24 = arg3 + arg1.anInt4395;
+			@Pc(24) int local24 = arg3 + arg1.mapSceneAngleOffset;
 			arg3 = local24 & 0x3;
 		} else {
 			arg3 = 0;
 		}
-		@Pc(42) SoftwareIndexedSprite local42 = local10.method9(arg3);
+		@Pc(42) SoftwareIndexedSprite local42 = local10.getSprite(arg3);
 		if (local42 == null) {
 			return false;
 		}
-		@Pc(49) int local49 = arg1.anInt4397;
+		@Pc(49) int local49 = arg1.width;
-		@Pc(52) int local52 = arg1.anInt4403;
+		@Pc(52) int local52 = arg1.length;
 		if ((arg3 & 0x1) == 1) {
-			local49 = arg1.anInt4403;
+			local49 = arg1.length;
-			local52 = arg1.anInt4397;
+			local52 = arg1.width;
 		}
 		@Pc(66) int local66 = local42.innerWidth;
-		@Pc(69) int local69 = local42.anInt4276;
+		@Pc(69) int local69 = local42.innerHeight;
 		if (local10.aBoolean2) {
 			local69 = local52 * 4;
 			local66 = local49 * 4;

client/src/main/java/Static34.java

@@ -93,7 +93,7 @@ public final class Static34 {
 		}
 		@Pc(26) byte[] local26 = Static132.aClass153_48.getFile(Static206.method3681(arg0), Static133.method4010(arg0));
 		local10 = new SpotAnimType();
-		local10.anInt1751 = arg0;
+		local10.id = arg0;
 		if (local26 != null) {
 			local10.method1316(new Buffer(local26));
 		}
@@ -106,36 +106,36 @@ public final class Static34 {
 		arg0.aBoolean171 = false;
 		@Pc(18) SeqType local18;
 		if (arg0.anInt3366 != -1) {
-			local18 = Static36.method941(arg0.anInt3366);
+			local18 = Static36.get(arg0.anInt3366);
-			if (local18 == null || local18.anIntArray473 == null) {
+			if (local18 == null || local18.frames == null) {
 				arg0.anInt3366 = -1;
 			} else {
 				arg0.anInt3396++;
-				if (local18.anIntArray473.length > arg0.anInt3407 && arg0.anInt3396 > local18.anIntArray474[arg0.anInt3407]) {
+				if (local18.frames.length > arg0.anInt3407 && arg0.anInt3396 > local18.anIntArray474[arg0.anInt3407]) {
 					arg0.anInt3396 = 1;
 					arg0.anInt3407++;
 					arg0.anInt3388++;
 					Static152.method2836(arg0.zFine, local18, arg0.xFine, arg0 == Static173.self, arg0.anInt3407);
 				}
-				if (arg0.anInt3407 >= local18.anIntArray473.length) {
+				if (arg0.anInt3407 >= local18.frames.length) {
 					arg0.anInt3407 = 0;
 					arg0.anInt3396 = 0;
 					Static152.method2836(arg0.zFine, local18, arg0.xFine, Static173.self == arg0, arg0.anInt3407);
 				}
 				arg0.anInt3388 = arg0.anInt3407 + 1;
-				if (arg0.anInt3388 >= local18.anIntArray473.length) {
+				if (arg0.anInt3388 >= local18.frames.length) {
 					arg0.anInt3388 = 0;
 				}
 			}
 		}
 		@Pc(156) int local156;
 		if (arg0.anInt3432 != -1 && Static83.loop >= arg0.anInt3359) {
-			local156 = method877(arg0.anInt3432).anInt1754;
+			local156 = method877(arg0.anInt3432).seqId;
 			if (local156 == -1) {
 				arg0.anInt3432 = -1;
 			} else {
-				@Pc(165) SeqType local165 = Static36.method941(local156);
+				@Pc(165) SeqType local165 = Static36.get(local156);
-				if (local165 == null || local165.anIntArray473 == null) {
+				if (local165 == null || local165.frames == null) {
 					arg0.anInt3432 = -1;
 				} else {
 					if (arg0.anInt3399 < 0) {
@@ -143,56 +143,56 @@ public final class Static34 {
 						Static152.method2836(arg0.zFine, local165, arg0.xFine, Static173.self == arg0, 0);
 					}
 					arg0.anInt3361++;
-					if (arg0.anInt3399 < local165.anIntArray473.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) {
+					if (arg0.anInt3399 < local165.frames.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) {
 						arg0.anInt3399++;
 						arg0.anInt3361 = 1;
 						Static152.method2836(arg0.zFine, local165, arg0.xFine, Static173.self == arg0, arg0.anInt3399);
 					}
-					if (arg0.anInt3399 >= local165.anIntArray473.length) {
+					if (arg0.anInt3399 >= local165.frames.length) {
 						arg0.anInt3432 = -1;
 					}
 					arg0.anInt3418 = arg0.anInt3399 + 1;
-					if (local165.anIntArray473.length <= arg0.anInt3418) {
+					if (local165.frames.length <= arg0.anInt3418) {
 						arg0.anInt3418 = -1;
 					}
 				}
 			}
 		}
 		if (arg0.anInt3369 != -1 && arg0.anInt3420 <= 1) {
-			local18 = Static36.method941(arg0.anInt3369);
+			local18 = Static36.get(arg0.anInt3369);
 			if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && Static83.loop >= arg0.anInt3395 && Static83.loop > arg0.anInt3386) {
 				arg0.anInt3420 = 1;
 				return;
 			}
 		}
 		if (arg0.anInt3369 != -1 && arg0.anInt3420 == 0) {
-			local18 = Static36.method941(arg0.anInt3369);
+			local18 = Static36.get(arg0.anInt3369);
-			if (local18 == null || local18.anIntArray473 == null) {
+			if (local18 == null || local18.frames == null) {
 				arg0.anInt3369 = -1;
 			} else {
 				arg0.anInt3360++;
-				if (arg0.anInt3425 < local18.anIntArray473.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) {
+				if (arg0.anInt3425 < local18.frames.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) {
 					arg0.anInt3360 = 1;
 					arg0.anInt3425++;
 					Static152.method2836(arg0.zFine, local18, arg0.xFine, arg0 == Static173.self, arg0.anInt3425);
 				}
-				if (local18.anIntArray473.length <= arg0.anInt3425) {
+				if (local18.frames.length <= arg0.anInt3425) {
 					arg0.anInt3425 -= local18.anInt5362;
 					arg0.anInt3371++;
 					if (arg0.anInt3371 >= local18.anInt5357) {
 						arg0.anInt3369 = -1;
-					} else if (arg0.anInt3425 >= 0 && local18.anIntArray473.length > arg0.anInt3425) {
+					} else if (arg0.anInt3425 >= 0 && local18.frames.length > arg0.anInt3425) {
 						Static152.method2836(arg0.zFine, local18, arg0.xFine, Static173.self == arg0, arg0.anInt3425);
 					} else {
 						arg0.anInt3369 = -1;
 					}
 				}
 				arg0.anInt3373 = arg0.anInt3425 + 1;
-				if (arg0.anInt3373 >= local18.anIntArray473.length) {
+				if (arg0.anInt3373 >= local18.frames.length) {
 					arg0.anInt3373 -= local18.anInt5362;
 					if (local18.anInt5357 <= arg0.anInt3371 + 1) {
 						arg0.anInt3373 = -1;
-					} else if (arg0.anInt3373 < 0 || arg0.anInt3373 >= local18.anIntArray473.length) {
+					} else if (arg0.anInt3373 < 0 || arg0.anInt3373 >= local18.frames.length) {
 						arg0.anInt3373 = -1;
 					}
 				}
@@ -208,33 +208,33 @@ public final class Static34 {
 				if (local545.anInt5408 > 0) {
 					local545.anInt5408--;
 				} else {
-					@Pc(570) SeqType local570 = Static36.method941(local545.anInt5396);
+					@Pc(570) SeqType local570 = Static36.get(local545.anInt5396);
-					if (local570 == null || local570.anIntArray473 == null) {
+					if (local570 == null || local570.frames == null) {
 						arg0.aClass147Array3[local156] = null;
 					} else {
 						local545.anInt5404++;
-						if (local545.anInt5399 < local570.anIntArray473.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) {
+						if (local545.anInt5399 < local570.frames.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) {
 							local545.anInt5399++;
 							local545.anInt5404 = 1;
 							Static152.method2836(arg0.zFine, local570, arg0.xFine, arg0 == Static173.self, local545.anInt5399);
 						}
-						if (local570.anIntArray473.length <= local545.anInt5399) {
+						if (local570.frames.length <= local545.anInt5399) {
 							local545.anInt5400++;
 							local545.anInt5399 -= local570.anInt5362;
 							if (local570.anInt5357 <= local545.anInt5400) {
 								arg0.aClass147Array3[local156] = null;
-							} else if (local545.anInt5399 >= 0 && local545.anInt5399 < local570.anIntArray473.length) {
+							} else if (local545.anInt5399 >= 0 && local545.anInt5399 < local570.frames.length) {
 								Static152.method2836(arg0.zFine, local570, arg0.xFine, Static173.self == arg0, local545.anInt5399);
 							} else {
 								arg0.aClass147Array3[local156] = null;
 							}
 						}
 						local545.anInt5398 = local545.anInt5399 + 1;
-						if (local570.anIntArray473.length <= local545.anInt5398) {
+						if (local570.frames.length <= local545.anInt5398) {
 							local545.anInt5398 -= local570.anInt5362;
 							if (local545.anInt5400 + 1 >= local570.anInt5357) {
 								local545.anInt5398 = -1;
-							} else if (local545.anInt5398 < 0 || local570.anIntArray473.length <= local545.anInt5398) {
+							} else if (local545.anInt5398 < 0 || local570.frames.length <= local545.anInt5398) {
 								local545.anInt5398 = -1;
 							}
 						}

client/src/main/java/Static36.java

@@ -38,7 +38,7 @@ public final class Static36 {
 	}
 
 	@OriginalMember(owner = "client!client", name = "a", descriptor = "(IB)Lclient!tk;")
-	public static SeqType method941(@OriginalArg(0) int arg0) {
+	public static SeqType get(@OriginalArg(0) int arg0) {
 		@Pc(17) SeqType local17 = (SeqType) Static142.aClass99_23.get((long) arg0);
 		if (local17 != null) {
 			return local17;
@@ -47,9 +47,9 @@ public final class Static36 {
 		local17 = new SeqType();
 		local17.anInt5361 = arg0;
 		if (local32 != null) {
-			local17.method4213(new Buffer(local32));
+			local17.decode(new Buffer(local32));
 		}
-		local17.method4218();
+		local17.postDecode();
 		Static142.aClass99_23.put(local17, (long) arg0);
 		return local17;
 	}

client/src/main/java/Static4.java

@@ -58,7 +58,7 @@ public final class Static4 {
 			return -1;
 		}
 		for (@Pc(20) int local20 = 0; local20 < Static9.anInt178; local20++) {
-			if (arg0.method3111(Static122.aClass100Array92[local20])) {
+			if (arg0.equalsIgnoreCase(Static122.aClass100Array92[local20])) {
 				return local20;
 			}
 		}
@@ -431,7 +431,7 @@ public final class Static4 {
 					local864 = Static57.aClass3_Sub15_Sub1_3.g1();
 					local1409 = Static57.aClass3_Sub15_Sub1_3.gjstr();
 					if (local864 >= 1 && local864 <= 8) {
-						if (local1409.method3111(Static92.aClass100_510)) {
+						if (local1409.equalsIgnoreCase(Static92.aClass100_510)) {
 							local1409 = null;
 						}
 						Static160.aClass100Array121[local864 - 1] = local1409;
@@ -569,7 +569,7 @@ public final class Static4 {
 										local171 = -1;
 									}
 									local1245 = true;
-									if (local171 != -1 && local1894.anInt3432 != -1 && Static36.method941(Static34.method877(local171).anInt1754).anInt5355 < Static36.method941(Static34.method877(local1894.anInt3432).anInt1754).anInt5355) {
+									if (local171 != -1 && local1894.anInt3432 != -1 && Static36.get(Static34.method877(local171).seqId).anInt5355 < Static36.get(Static34.method877(local1894.anInt3432).seqId).anInt5355) {
 										local1245 = false;
 									}
 									if (local1245) {
@@ -583,10 +583,10 @@ public final class Static4 {
 										local1894.anInt3394 = local786;
 										local1894.anInt3418 = 1;
 										if (local1894.anInt3432 != -1 && Static83.loop == local1894.anInt3359) {
-											local1986 = Static34.method877(local1894.anInt3432).anInt1754;
+											local1986 = Static34.method877(local1894.anInt3432).seqId;
 											if (local1986 != -1) {
-												local1994 = Static36.method941(local1986);
+												local1994 = Static36.get(local1986);
-												if (local1994 != null && local1994.anIntArray473 != null) {
+												if (local1994 != null && local1994.frames != null) {
 													Static152.method2836(local1894.zFine, local1994, local1894.xFine, false, 0);
 												}
 											}
@@ -606,7 +606,7 @@ public final class Static4 {
 										local171 = -1;
 									}
 									local1245 = true;
-									if (local171 != -1 && local2033.anInt3432 != -1 && Static36.method941(Static34.method877(local171).anInt1754).anInt5355 < Static36.method941(Static34.method877(local2033.anInt3432).anInt1754).anInt5355) {
+									if (local171 != -1 && local2033.anInt3432 != -1 && Static36.get(Static34.method877(local171).seqId).anInt5355 < Static36.get(Static34.method877(local2033.anInt3432).seqId).anInt5355) {
 										local1245 = false;
 									}
 									if (local1245) {
@@ -623,10 +623,10 @@ public final class Static4 {
 											local2033.anInt3399 = -1;
 										}
 										if (local2033.anInt3432 != -1 && local2033.anInt3359 == Static83.loop) {
-											local1986 = Static34.method877(local2033.anInt3432).anInt1754;
+											local1986 = Static34.method877(local2033.anInt3432).seqId;
 											if (local1986 != -1) {
-												local1994 = Static36.method941(local1986);
+												local1994 = Static36.get(local1986);
-												if (local1994 != null && local1994.anIntArray473 != null) {
+												if (local1994 != null && local1994.frames != null) {
 													Static152.method2836(local2033.zFine, local1994, local2033.xFine, local2033 == Static173.self, 0);
 												}
 											}
@@ -1500,20 +1500,20 @@ public final class Static4 {
 										@Pc(5615) ObjType local5615;
 										if (local5603.aBoolean32) {
 											Static209.method3707(local786, local133, local864);
-											local5615 = Static71.method1439(local864);
+											local5615 = Static71.get(local864);
-											Static261.method4505(local5615.anInt2375, local786, local5615.anInt2369, local5615.anInt2353);
+											Static261.method4505(local5615.zoom2d, local786, local5615.yAngle2d, local5615.xAngle2d);
-											Static145.method2745(local786, local5615.anInt2339, local5615.anInt2319, local5615.anInt2359);
+											Static145.method2745(local786, local5615.zAngle2d, local5615.yOffset2d, local5615.xOffset2d);
 										} else if (local864 == -1) {
 											local5603.modelType = 0;
 											Static164.anInt3985 = -1;
 											return true;
 										} else {
-											local5615 = Static71.method1439(local864);
+											local5615 = Static71.get(local864);
-											local5603.modelXAngle = local5615.anInt2353;
+											local5603.modelXAngle = local5615.xAngle2d;
-											local5603.modelZoom = local5615.anInt2375 * 100 / local133;
+											local5603.modelZoom = local5615.zoom2d * 100 / local133;
 											local5603.modelType = 4;
 											local5603.modelId = local864;
-											local5603.modelYAngle = local5615.anInt2369;
+											local5603.modelYAngle = local5615.yAngle2d;
 											Static43.redraw(local5603);
 										}
 									}

client/src/main/java/Static40.java

@@ -88,7 +88,7 @@ public final class Static40 {
 		@Pc(20) byte[] local20 = Static98.aClass153_42.getFile(34, arg0);
 		local10 = new MsiType();
 		if (local20 != null) {
-			local10.method6(new Buffer(local20), arg0);
+			local10.decode(new Buffer(local20), arg0);
 		}
 		Static231.aClass99_29.put(local10, (long) arg0);
 		return local10;

client/src/main/java/Static41.java

@@ -81,7 +81,7 @@ public final class Static41 {
 					}
 				}
 			}
-			local33 = local103.method1679(64, 768, -50, -10, -50);
+			local33 = local103.createModel(64, 768, -50, -10, -50);
 			Static45.aClass99_6.put(local33, local23);
 		}
 		@Pc(367) int local367 = arg7 * 64 - 1;
@@ -94,8 +94,8 @@ public final class Static41 {
 		local126 = arg8.method4576();
 		local130 = arg8.method4550();
 		if (arg2 != null) {
-			@Pc(403) int local403 = arg2.anIntArray473[arg10];
+			@Pc(403) int local403 = arg2.frames[arg10];
-			local386 = Static72.method1566(local403 >> 16);
+			local386 = Static72.getAnimFrameset(local403 >> 16);
 			arg10 = local403 & 0xFFFF;
 		}
 		local109 = local367;
@@ -127,11 +127,11 @@ public final class Static41 {
 		}
 		if (local386 == null) {
 			local33 = local33.method4560(true, true, true);
-			local33.method4559((local115 - local384) / 2, 128, (local130 - local126) / 2);
+			local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2);
 			local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2);
 		} else {
 			local33 = local33.method4560(!local386.isAlphaTransformed(arg10), !local386.isColorTransformed(arg10), true);
-			local33.method4559((local115 - local384) / 2, 128, (local130 - local126) / 2);
+			local33.resize((local115 - local384) / 2, 128, (local130 - local126) / 2);
 			local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2);
 			local33.method4555(local386, arg10);
 		}

client/src/main/java/Static43.java

@@ -70,8 +70,8 @@ public final class Static43 {
 		}
 		@Pc(57) int local57 = (int) local9 >> 14 & 0x1F;
 		@Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE;
-		@Pc(74) LocType local74 = Static271.method4601(local70);
+		@Pc(74) LocType local74 = Static271.get(local70);
-		if (local74.method3422()) {
+		if (local74.hasAreaSound()) {
 			Static209.method3701(arg1, local74, arg0, arg2);
 		}
 		@Pc(92) int local92 = (int) local9 >> 20 & 0x3;
@@ -100,8 +100,8 @@ public final class Static43 {
 			if (local148 != null) {
 				local100 = local148.aClass8_4;
 			}
-			if (local74.anInt4435 != 0 && local74.anInt4397 + arg1 < 104 && local74.anInt4397 + arg0 < 104 && arg1 + local74.anInt4403 < 104 && arg0 + local74.anInt4403 < 104) {
+			if (local74.anInt4435 != 0 && local74.width + arg1 < 104 && local74.width + arg0 < 104 && arg1 + local74.length < 104 && arg0 + local74.length < 104) {
-				arg5.unflagScenery(arg1, local74.anInt4397, local74.aBoolean207, local92, local74.anInt4403, arg0);
+				arg5.unflagScenery(arg1, local74.width, local74.aBoolean207, local92, local74.length, arg0);
 			}
 		} else if (arg3 == 3) {
 			@Pc(211) GroundDecor local211 = Static267.method4526(arg2, arg1, arg0);