Consolidated a little more

client/src/main/java/rt4/Camera.java

@@ -63,4 +63,169 @@ public class Camera {
             Static234.anInt5245 += (local64 - Static234.anInt5245) / 80;
         }
     }
+
+    @OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V")
+    public static void updateLockedCamera() {
+        @Pc(9) int local9 = Static248.anInt4232 * 128 + 64;
+        @Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
+        @Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
+        if (Static113.anInt4612 >= 100) {
+            Static138.renderX = Static245.anInt5375 * 128 + 64;
+            Static134.renderZ = Static248.anInt4232 * 128 + 64;
+            Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
+        } else {
+            if (Static138.renderX < local15) {
+                Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000;
+                if (Static138.renderX > local15) {
+                    Static138.renderX = local15;
+                }
+            }
+            if (Static5.anInt40 < local23) {
+                Static5.anInt40 += (local23 - Static5.anInt40) * Static113.anInt4612 / 1000 + Static233.anInt5225;
+                if (Static5.anInt40 > local23) {
+                    Static5.anInt40 = local23;
+                }
+            }
+            if (Static138.renderX > local15) {
+                Static138.renderX -= Static233.anInt5225 + (Static138.renderX - local15) * Static113.anInt4612 / 1000;
+                if (Static138.renderX < local15) {
+                    Static138.renderX = local15;
+                }
+            }
+            if (Static134.renderZ < local9) {
+                Static134.renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.renderZ) / 1000;
+                if (local9 < Static134.renderZ) {
+                    Static134.renderZ = local9;
+                }
+            }
+            if (local23 < Static5.anInt40) {
+                Static5.anInt40 -= (Static5.anInt40 - local23) * Static113.anInt4612 / 1000 + Static233.anInt5225;
+                if (local23 > Static5.anInt40) {
+                    Static5.anInt40 = local23;
+                }
+            }
+            if (Static134.renderZ > local9) {
+                Static134.renderZ -= Static233.anInt5225 + (Static134.renderZ - local9) * Static113.anInt4612 / 1000;
+                if (local9 > Static134.renderZ) {
+                    Static134.renderZ = local9;
+                }
+            }
+        }
+        local9 = Static265.anInt5765 * 128 + 64;
+        local15 = Static251.anInt5449 * 128 + 64;
+        local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
+        @Pc(236) int local236 = local23 - Static5.anInt40;
+        @Pc(241) int local241 = local9 - Static134.renderZ;
+        @Pc(246) int local246 = local15 - Static138.renderX;
+        @Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241));
+        @Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF;
+        if (local268 < 128) {
+            local268 = 128;
+        }
+        if (local268 > 383) {
+            local268 = 383;
+        }
+        @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
+        if (Static240.cameraPitch < local268) {
+            Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000;
+            if (Static240.cameraPitch > local268) {
+                Static240.cameraPitch = local268;
+            }
+        }
+        if (Static240.cameraPitch > local268) {
+            Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
+            if (Static240.cameraPitch < local268) {
+                Static240.cameraPitch = local268;
+            }
+        }
+        @Pc(350) int local350 = local292 - Static184.cameraYaw;
+        if (local350 > 1024) {
+            local350 -= 2048;
+        }
+        if (local350 < -1024) {
+            local350 += 2048;
+        }
+        if (local350 > 0) {
+            Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
+            Static184.cameraYaw &= 0x7FF;
+        }
+        if (local350 < 0) {
+            Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
+            Static184.cameraYaw &= 0x7FF;
+        }
+        @Pc(404) int local404 = local292 - Static184.cameraYaw;
+        if (local404 > 1024) {
+            local404 -= 2048;
+        }
+        if (local404 < -1024) {
+            local404 += 2048;
+        }
+        if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) {
+            Static184.cameraYaw = local292;
+        }
+    }
+
+    @OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V")
+    public static void updateLoginScreenCamera() {
+        if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) {
+            return;
+        }
+        @Pc(27) int local27 = (Static233.anInt5224 * (Static114.anInt5843 - Static228.anInt5101) >> 16) + Static228.anInt5101;
+        @Pc(30) float[] renderCoordinates = new float[3];
+        Static233.anInt5224 += local27;
+        if (Static233.anInt5224 >= 65535) {
+            Static233.anInt5224 = 65535;
+            if (Static186.aBoolean205) {
+                Static13.aBoolean16 = false;
+            } else {
+                Static13.aBoolean16 = true;
+            }
+            Static186.aBoolean205 = true;
+        } else {
+            Static186.aBoolean205 = false;
+            Static13.aBoolean16 = false;
+        }
+        @Pc(66) float local66 = (float) Static233.anInt5224 / 65535.0F;
+        @Pc(70) int local70 = Static127.anInt3125 * 2;
+        @Pc(141) int local141;
+        @Pc(131) int local131;
+        @Pc(111) int local111;
+        @Pc(119) int local119;
+        @Pc(146) int local146;
+        @Pc(155) int local155;
+        @Pc(173) int local173;
+        for (@Pc(72) int local72 = 0; local72 < 3; local72++) {
+            local111 = (Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] - Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 3][local72]) * 3;
+            local119 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72];
+            local131 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 1][local72] * 3;
+            local141 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72] * 3;
+            local146 = local131 - local141;
+            local155 = local111 + local141 - local131 * 2;
+            local173 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + local131 - local119 - local111;
+            renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66;
+        }
+        Static5.anInt40 = (int) renderCoordinates[1] * -1;
+        Static138.renderX = (int) renderCoordinates[0] - Static225.originX * 128;
+        Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128;
+        @Pc(226) float[] local226 = new float[3];
+        local141 = Static75.anInt2119 * 2;
+        for (local131 = 0; local131 < 3; local131++) {
+            local111 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131] * 3;
+            local146 = (Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] - Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 3][local131]) * 3;
+            local155 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131];
+            local119 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 1][local131] * 3;
+            local173 = local119 - local111;
+            @Pc(313) int local313 = local146 + local111 - local119 * 2;
+            @Pc(331) int local331 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + local119 - local146 - local155;
+            local226[local131] = (float) local155 + local66 * (local66 * (local66 * (float) local331 + (float) local313) + (float) local173);
+        }
+        @Pc(363) float local363 = local226[0] - renderCoordinates[0];
+        @Pc(371) float local371 = local226[2] - renderCoordinates[2];
+        @Pc(382) float local382 = (local226[1] - renderCoordinates[1]) * -1.0F;
+        @Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
+        Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
+        Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
+        Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
+        Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
+    }
 }

client/src/main/java/rt4/Font.java

@@ -336,7 +336,7 @@ public abstract class Font extends SecondaryNode {
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIII)V")
-	public final void method2857(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public final void renderLeft(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (arg0 != null) {
 			this.setColors(arg3, arg4);
 			this.render(arg0, arg1, arg2);

client/src/main/java/rt4/Fonts.java

@@ -47,7 +47,7 @@ public class Fonts {
     public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
         p11Full = Static127.method2462(Sprites.p11FullId, arg1, arg0);
         if (GlRenderer.enabled) {
-            p11FullSoftware = Static122.method2412(Sprites.p11FullId, arg0, arg1);
+            p11FullSoftware = SoftwareFont.method2412(Sprites.p11FullId, arg0, arg1);
         } else {
             p11FullSoftware = (SoftwareFont) p11Full;
         }

client/src/main/java/rt4/FriendsList.java

@@ -110,4 +110,17 @@ public class FriendsList {
         Protocol.outboundBuffer.p1a(arg1);
         Protocol.outboundBuffer.p8(arg0.encode37());
     }
+
+    @OriginalMember(owner = "client!ac", name = "a", descriptor = "(Lclient!na;I)I")
+    public static int method25(@OriginalArg(0) JagString arg0) {
+        if (arg0 == null) {
+            return -1;
+        }
+        for (@Pc(20) int local20 = 0; local20 < size; local20++) {
+            if (arg0.equalsIgnoreCase(usernames[local20])) {
+                return local20;
+            }
+        }
+        return -1;
+    }
 }

client/src/main/java/rt4/GameShell.java

@@ -582,8 +582,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		try {
 			leftMargin = 0;
 			clientBuild = 530;
-			frameWidth = 765;
+			frameWidth = 1024;
-			frameHeight = 503;
+			frameHeight = 768;
 			canvasWidth = frameWidth;
 			canvasHeight = frameHeight;
 			topMargin = 0;

client/src/main/java/rt4/GlRaster.java

@@ -158,7 +158,7 @@ public final class GlRaster {
 	}
 
 	@OriginalMember(owner = "client!dj", name = "c", descriptor = "(IIIIII)V")
-	public static void method1182(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+	public static void fillRectAlpha(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
 		GlRenderer.method4162();
 		@Pc(3) float local3 = (float) arg0;
 		@Pc(8) float local8 = local3 + (float) arg2;

client/src/main/java/rt4/GlSprite.java

@@ -207,7 +207,7 @@ public class GlSprite extends Sprite {
 
 	@OriginalMember(owner = "client!cf", name = "d", descriptor = "(II)V")
 	@Override
-	public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final void renderHorizontalFlipTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		GlRenderer.method4149();
 		@Pc(5) int local5 = arg0 + this.anInt1863;
 		@Pc(10) int local10 = arg1 + this.anInt1861;

client/src/main/java/rt4/Inv.java

@@ -112,4 +112,9 @@ public final class Inv extends Node {
             local14.unlink();
         }
     }
+
+    @OriginalMember(owner = "client!hn", name = "f", descriptor = "(B)V")
+    public static void method2073() {
+        objectContainerCache = new HashTable(32);
+    }
 }

client/src/main/java/rt4/JagString.java

@@ -188,6 +188,11 @@ public final class JagString implements StringInterface {
         return arg0 == 198 || arg0 == 230 || arg0 == 156 || arg0 == 140 || arg0 == 223;
     }
 
+    @OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZII)Lclient!na;")
+    public static JagString parseIntTrue(@OriginalArg(2) int arg0) {
+        return parseInt(true, arg0);
+    }
+
     @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
 	public final URL method3107() throws MalformedURLException {
 		return new URL(new String(this.chars, 0, this.length));
@@ -283,12 +288,7 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IILjava/awt/Graphics;B)V")
 	public final void method3112(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Graphics arg2) {
-		@Pc(17) String local17;
+		@Pc(17) String local17 = new String(this.chars, 0, this.length, StandardCharsets.ISO_8859_1);
-		try {
-			local17 = new String(this.chars, 0, this.length, "ISO-8859-1");
-		} catch (@Pc(19) UnsupportedEncodingException local19) {
-			local17 = new String(this.chars, 0, this.length);
-		}
 		arg2.drawString(local17, arg1, arg0);
 	}
 
@@ -503,12 +503,7 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!na", name = "c", descriptor = "(Z)V")
 	public final void print() {
-		@Pc(16) String local16;
+		@Pc(16) String local16 = new String(this.chars, 0, this.length, StandardCharsets.ISO_8859_1);
-		try {
-			local16 = new String(this.chars, 0, this.length, "ISO-8859-1");
-		} catch (@Pc(18) UnsupportedEncodingException local18) {
-			local16 = new String(this.chars, 0, this.length);
-		}
 		System.out.println(local16);
 	}
 
@@ -920,12 +915,7 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(ILjava/awt/FontMetrics;)I")
 	public final int method3155(@OriginalArg(1) FontMetrics arg0) {
-		@Pc(14) String local14;
+		@Pc(14) String local14 = new String(this.chars, 0, this.length, StandardCharsets.ISO_8859_1);
-		try {
-			local14 = new String(this.chars, 0, this.length, "ISO-8859-1");
-		} catch (@Pc(16) UnsupportedEncodingException local16) {
-			local14 = new String(this.chars, 0, this.length);
-		}
 		return arg0.stringWidth(local14);
 	}
 

client/src/main/java/rt4/LoginManager.java

@@ -494,4 +494,50 @@ public class LoginManager {
             clear();
         }
     }
+
+    @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
+	public static void setupLoadingScreenRegion() {
+		@Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3);
+		@Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3);
+		Static156.locationMapFilesBuffer = new byte[18][];
+		Static35.underWaterLocationsMapFileIds = new int[18];
+		Static191.npcSpawnsFilesBuffer = new byte[18][];
+		Static36.mapFileIds = new int[18];
+		Static72.regionsXteaKeys = new int[18][4];
+		Static186.underWaterMapFilesBuffer = new byte[18][];
+		Static238.regionBitPacked = new int[18];
+		Static273.mapFilesBuffer = new byte[18][];
+		Static175.npcSpawnsFileIds = new int[18];
+		Static99.underWaterMapFileIds = new int[18];
+		Static172.locationsMapFileIds = new int[18];
+		Static19.underWaterLocationsMapFilesBuffer = new byte[18][];
+		@Pc(74) int local74 = 0;
+		@Pc(80) int local80;
+		for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) {
+			for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
+				@Pc(115) int local115 = (local80 << 8) + local97;
+				Static238.regionBitPacked[local74] = local115;
+				Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				if (Static175.npcSpawnsFileIds[local74] == -1) {
+					Static36.mapFileIds[local74] = -1;
+					Static172.locationsMapFileIds[local74] = -1;
+					Static99.underWaterMapFileIds[local74] = -1;
+					Static35.underWaterLocationsMapFileIds[local74] = -1;
+				}
+				local74++;
+			}
+		}
+		for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) {
+			Static175.npcSpawnsFileIds[local80] = -1;
+			Static36.mapFileIds[local80] = -1;
+			Static172.locationsMapFileIds[local80] = -1;
+			Static99.underWaterMapFileIds[local80] = -1;
+			Static35.underWaterLocationsMapFileIds[local80] = -1;
+		}
+		Static127.method2463(0, local23, local10, 8, true, 8);
+	}
 }

client/src/main/java/rt4/MapList.java

@@ -46,4 +46,16 @@ public class MapList {
 		}
 		return null;
 	}
+
+    @OriginalMember(owner = "client!hb", name = "b", descriptor = "(II)Z")
+	public static boolean method1855(@OriginalArg(0) int arg0) {
+		return arg0 >= 0 && aBooleanArray130.length > arg0 ? aBooleanArray130[arg0] : false;
+	}
+
+    @OriginalMember(owner = "client!ui", name = "d", descriptor = "(II)V")
+    public static void method4332(@OriginalArg(0) int arg0) {
+        if (arg0 >= 0 && aBooleanArray130.length > arg0) {
+            aBooleanArray130[arg0] = !aBooleanArray130[arg0];
+        }
+    }
 }

client/src/main/java/rt4/MidiInstrument.java

@@ -391,6 +391,12 @@ public final class MidiInstrument extends Node {
 		return (arg0 + local12) / arg1 - local12;
 	}
 
+    @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;")
+	public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
+		@Pc(9) byte[] local9 = arg0.method4500(arg1);
+		return local9 == null ? null : new MidiInstrument(local9);
+	}
+
     @OriginalMember(owner = "client!jk", name = "d", descriptor = "(B)V")
 	public final void method2432() {
 		this.anIntArray289 = null;

client/src/main/java/rt4/MidiPcmStream.java

@@ -116,7 +116,7 @@ public final class MidiPcmStream extends PcmStream {
 			@Pc(40) int local40 = (int) local34.key;
 			@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get((long) local40);
 			if (local48 == null) {
-				local48 = Static116.method2320(arg1, local40);
+				local48 = MidiInstrument.method2320(arg1, local40);
 				if (local48 == null) {
 					local5 = false;
 					continue;

client/src/main/java/rt4/MidiPlayer.java

@@ -37,10 +37,10 @@ public class MidiPlayer {
                 if (aClass89_1 == null) {
                     aClass89_1 = new SoundBank(Static78.aClass153_32, aClass153_103);
                 }
-                if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, aClass153_87, aClass89_1)) {
+                if (Static172.midiPcmStream.method4411(Static144.aClass3_Sub29_1, aClass153_87, aClass89_1)) {
-                    Static172.aClass3_Sub3_Sub4_2.method4412();
+                    Static172.midiPcmStream.method4412();
-                    Static172.aClass3_Sub3_Sub4_2.method4447(anInt5527);
+                    Static172.midiPcmStream.method4447(anInt5527);
-                    Static172.aClass3_Sub3_Sub4_2.method4431(aBoolean116, Static144.aClass3_Sub29_1);
+                    Static172.midiPcmStream.method4431(aBoolean116, Static144.aClass3_Sub29_1);
                     anInt441 = 0;
                     Static144.aClass3_Sub29_1 = null;
                     aClass89_1 = null;
@@ -50,7 +50,7 @@ public class MidiPlayer {
             }
         } catch (@Pc(68) Exception local68) {
             local68.printStackTrace();
-            Static172.aClass3_Sub3_Sub4_2.method4446();
+            Static172.midiPcmStream.method4446();
             Static172.aClass153_70 = null;
             Static144.aClass3_Sub29_1 = null;
             anInt441 = 0;
@@ -86,7 +86,7 @@ public class MidiPlayer {
         aClass153_87 = arg1;
         Static78.aClass153_32 = arg3;
         aClass153_103 = arg2;
-        Static172.aClass3_Sub3_Sub4_2 = arg0;
+        Static172.midiPcmStream = arg0;
         return true;
     }
 
@@ -94,17 +94,17 @@ public class MidiPlayer {
     public static void loop() {
         try {
             if (anInt441 == 1) {
-                @Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440();
+                @Pc(16) int local16 = Static172.midiPcmStream.method4440();
-                if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) {
+                if (local16 > 0 && Static172.midiPcmStream.method4414()) {
                     local16 -= anInt1757;
                     if (local16 < 0) {
                         local16 = 0;
                     }
-                    Static172.aClass3_Sub3_Sub4_2.method4447(local16);
+                    Static172.midiPcmStream.method4447(local16);
                     return;
                 }
-                Static172.aClass3_Sub3_Sub4_2.method4446();
+                Static172.midiPcmStream.method4446();
-                Static172.aClass3_Sub3_Sub4_2.method4426();
+                Static172.midiPcmStream.method4426();
                 Static144.aClass3_Sub29_1 = null;
                 aClass89_1 = null;
                 if (Static172.aClass153_70 == null) {
@@ -115,7 +115,7 @@ public class MidiPlayer {
             }
         } catch (@Pc(62) Exception local62) {
             local62.printStackTrace();
-            Static172.aClass3_Sub3_Sub4_2.method4446();
+            Static172.midiPcmStream.method4446();
             Static172.aClass153_70 = null;
             Static144.aClass3_Sub29_1 = null;
             anInt441 = 0;

client/src/main/java/rt4/MiniMap.java

@@ -287,7 +287,7 @@ public class MiniMap {
             }
             for (local146 = 0; local146 < 104; local146++) {
                 for (local181 = 0; local181 < 104; local181++) {
-                    @Pc(439) LinkedList local439 = Static159.objStacks[Player.level][local146][local181];
+                    @Pc(439) LinkedList local439 = SceneGraph.objStacks[Player.level][local146][local181];
                     if (local439 != null) {
                         local154 = local146 * 4 + 2 - PlayerList.self.xFine / 32;
                         local231 = local181 * 4 + 2 - PlayerList.self.zFine / 32;

client/src/main/java/rt4/MiniMenu.java

@@ -1183,7 +1183,7 @@ public class MiniMenu {
                     addPlayerEntries(local140, z, player, x);
                 }
                 if (local133 == 3) {
-                    @Pc(931) LinkedList objStacks = Static159.objStacks[Player.level][x][z];
+                    @Pc(931) LinkedList objStacks = SceneGraph.objStacks[Player.level][x][z];
                     if (objStacks != null) {
                         for (@Pc(940) ObjStackNode node = (ObjStackNode) objStacks.tail(); node != null; node = (ObjStackNode) objStacks.prev()) {
                             local240 = node.value.type;

client/src/main/java/rt4/NpcList.java

@@ -1,6 +1,8 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
 
 public class NpcList {
     @OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;")
@@ -9,4 +11,611 @@ public class NpcList {
     public static final int[] ids = new int[32768];
     @OriginalMember(owner = "client!wd", name = "g", descriptor = "I")
 	public static int size = 0;
+
+    @OriginalMember(owner = "client!ig", name = "a", descriptor = "(I)V")
+    public static void method2274() {
+        for (@Pc(7) int local7 = 0; local7 < size; local7++) {
+            @Pc(18) int local18 = ids[local7];
+            @Pc(22) Npc local22 = npcs[local18];
+            if (local22 != null) {
+                method4514(local22.type.size, local22);
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!vg", name = "a", descriptor = "(IILclient!fe;)V")
+    public static void method4514(@OriginalArg(0) int arg0, @OriginalArg(2) PathingEntity arg1) {
+        if (client.loop < arg1.anInt3395) {
+            method553(arg1);
+        } else if (arg1.anInt3386 >= client.loop) {
+            method4665(arg1);
+        } else {
+            method2247(arg1);
+        }
+        if (arg1.xFine < 128 || arg1.zFine < 128 || arg1.xFine >= 13184 || arg1.zFine >= 13184) {
+            arg1.seqId = -1;
+            arg1.spotAnimId = -1;
+            arg1.anInt3395 = 0;
+            arg1.anInt3386 = 0;
+            arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
+            arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64;
+            arg1.method2689();
+        }
+        if (arg1 == PlayerList.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) {
+            arg1.spotAnimId = -1;
+            arg1.anInt3395 = 0;
+            arg1.anInt3386 = 0;
+            arg1.seqId = -1;
+            arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
+            arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64;
+            arg1.method2689();
+        }
+        method949(arg1);
+        method879(arg1);
+    }
+
+    @OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V")
+    public static void method553(@OriginalArg(0) PathingEntity arg0) {
+        @Pc(8) int local8 = arg0.anInt3395 - client.loop;
+        @Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
+        @Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
+        if (arg0.anInt3431 == 0) {
+            arg0.anInt3400 = 1024;
+        }
+        arg0.xFine += (local20 - arg0.xFine) / local8;
+        arg0.zFine += (local36 - arg0.zFine) / local8;
+        if (arg0.anInt3431 == 1) {
+            arg0.anInt3400 = 1536;
+        }
+        arg0.anInt3417 = 0;
+        if (arg0.anInt3431 == 2) {
+            arg0.anInt3400 = 0;
+        }
+        if (arg0.anInt3431 == 3) {
+            arg0.anInt3400 = 512;
+        }
+    }
+
+    @OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V")
+    public static void method4665(@OriginalArg(0) PathingEntity arg0) {
+        if (client.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.get(arg0.seqId).anIntArray474[arg0.anInt3425]) {
+            @Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395;
+            @Pc(41) int local41 = client.loop - arg0.anInt3395;
+            @Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
+            @Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
+            @Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.getSize() * 64;
+            @Pc(86) int local86 = arg0.anInt3392 * 128 + arg0.getSize() * 64;
+            arg0.xFine = (local41 * local75 + local52 * (local35 - local41)) / local35;
+            arg0.zFine = (local86 * local41 + local64 * (local35 - local41)) / local35;
+        }
+        arg0.anInt3417 = 0;
+        if (arg0.anInt3431 == 0) {
+            arg0.anInt3400 = 1024;
+        }
+        if (arg0.anInt3431 == 1) {
+            arg0.anInt3400 = 1536;
+        }
+        if (arg0.anInt3431 == 2) {
+            arg0.anInt3400 = 0;
+        }
+        if (arg0.anInt3431 == 3) {
+            arg0.anInt3400 = 512;
+        }
+        arg0.anInt3381 = arg0.anInt3400;
+    }
+
+    @OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
+    public static void method2247(@OriginalArg(1) PathingEntity arg0) {
+        @Pc(9) BasType local9 = arg0.getBasType();
+        arg0.movementSeqId = local9.idleAnimationId;
+        if (arg0.movementQueueSize == 0) {
+            arg0.anInt3417 = 0;
+            return;
+        }
+        if (arg0.seqId != -1 && arg0.anInt3420 == 0) {
+            @Pc(40) SeqType local40 = SeqTypeList.get(arg0.seqId);
+            if (arg0.anInt3405 > 0 && local40.anInt5363 == 0) {
+                arg0.anInt3417++;
+                return;
+            }
+            if (arg0.anInt3405 <= 0 && local40.anInt5349 == 0) {
+                arg0.anInt3417++;
+                return;
+            }
+        }
+        @Pc(79) int local79 = arg0.xFine;
+        @Pc(82) int local82 = arg0.zFine;
+        @Pc(99) int local99 = arg0.movementQueueX[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
+        @Pc(116) int local116 = arg0.movementQueueZ[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
+        if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) {
+            arg0.xFine = local99;
+            arg0.zFine = local116;
+            return;
+        }
+        if (local99 <= local79) {
+            if (local79 <= local99) {
+                if (local116 > local82) {
+                    arg0.anInt3400 = 1024;
+                } else if (local82 > local116) {
+                    arg0.anInt3400 = 0;
+                }
+            } else if (local116 > local82) {
+                arg0.anInt3400 = 768;
+            } else if (local116 < local82) {
+                arg0.anInt3400 = 256;
+            } else {
+                arg0.anInt3400 = 512;
+            }
+        } else if (local116 > local82) {
+            arg0.anInt3400 = 1280;
+        } else if (local82 > local116) {
+            arg0.anInt3400 = 1792;
+        } else {
+            arg0.anInt3400 = 1536;
+        }
+        @Pc(224) int local224 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
+        @Pc(227) int local227 = local9.turnAnimation1;
+        if (local224 > 1024) {
+            local224 -= 2048;
+        }
+        @Pc(233) boolean local233 = true;
+        @Pc(235) byte local235 = 1;
+        if (local224 >= -256 && local224 <= 256) {
+            local227 = local9.walkAnimation;
+        } else if (local224 >= 256 && local224 < 768) {
+            local227 = local9.turnAnimation3;
+        } else if (local224 >= -768 && local224 <= -256) {
+            local227 = local9.turnAnimation2;
+        }
+        @Pc(273) int local273 = 4;
+        if (local227 == -1) {
+            local227 = local9.walkAnimation;
+        }
+        arg0.movementSeqId = local227;
+        if (arg0 instanceof Npc) {
+            local233 = ((Npc) arg0).type.aBoolean181;
+        }
+        if (local233) {
+            if (arg0.anInt3381 != arg0.anInt3400 && arg0.faceEntity == -1 && arg0.anInt3376 != 0) {
+                local273 = 2;
+            }
+            if (arg0.movementQueueSize > 2) {
+                local273 = 6;
+            }
+            if (arg0.movementQueueSize > 3) {
+                local273 = 8;
+            }
+            if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
+                local273 = 8;
+                arg0.anInt3417--;
+            }
+        } else {
+            if (arg0.movementQueueSize > 1) {
+                local273 = 6;
+            }
+            if (arg0.movementQueueSize > 2) {
+                local273 = 8;
+            }
+            if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
+                arg0.anInt3417--;
+                local273 = 8;
+            }
+        }
+        if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 2) {
+            local273 <<= 0x1;
+            local235 = 2;
+        } else if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 0) {
+            local235 = 0;
+            local273 >>= 0x1;
+        }
+        if (local273 < 8 || local9.runAnimationId == -1) {
+            if (local9.anInt1062 != -1 && local235 == 0) {
+                if (local9.turnAnimation1 == arg0.movementSeqId && local9.anInt1042 != -1) {
+                    arg0.movementSeqId = local9.anInt1042;
+                } else if (local9.turnAnimation2 == arg0.movementSeqId && local9.anInt1066 != -1) {
+                    arg0.movementSeqId = local9.anInt1066;
+                } else if (local9.turnAnimation3 == arg0.movementSeqId && local9.anInt1048 != -1) {
+                    arg0.movementSeqId = local9.anInt1048;
+                } else {
+                    arg0.movementSeqId = local9.anInt1062;
+                }
+            }
+        } else if (local9.turnAnimation1 == arg0.movementSeqId && local9.runAnimationId2 != -1) {
+            arg0.movementSeqId = local9.runAnimationId2;
+        } else if (arg0.movementSeqId == local9.turnAnimation2 && local9.runAnimationId3 != -1) {
+            arg0.movementSeqId = local9.runAnimationId3;
+        } else if (arg0.movementSeqId == local9.turnAnimation3 && local9.runAnimationId4 != -1) {
+            arg0.movementSeqId = local9.runAnimationId4;
+        } else {
+            arg0.movementSeqId = local9.runAnimationId;
+        }
+        if (local9.anInt1032 != -1) {
+            local273 <<= 0x7;
+            if (arg0.movementQueueSize == 1) {
+                @Pc(594) int local594 = (local99 >= arg0.xFine ? local99 - arg0.xFine : -local99 + arg0.xFine) << 7;
+                @Pc(600) int local600 = arg0.anInt3358 * arg0.anInt3358;
+                @Pc(622) int local622 = (local116 < arg0.zFine ? arg0.zFine - local116 : -arg0.zFine + local116) << 7;
+                @Pc(629) int local629 = local594 > local622 ? local594 : local622;
+                @Pc(636) int local636 = local9.anInt1032 * 2 * local629;
+                if (local636 < local600) {
+                    arg0.anInt3358 /= 2;
+                } else if (local629 < local600 / 2) {
+                    arg0.anInt3358 -= local9.anInt1032;
+                    if (arg0.anInt3358 < 0) {
+                        arg0.anInt3358 = 0;
+                    }
+                } else if (arg0.anInt3358 < local273) {
+                    arg0.anInt3358 += local9.anInt1032;
+                    if (arg0.anInt3358 > local273) {
+                        arg0.anInt3358 = local273;
+                    }
+                }
+            } else if (local273 > arg0.anInt3358) {
+                arg0.anInt3358 += local9.anInt1032;
+                if (local273 < arg0.anInt3358) {
+                    arg0.anInt3358 = local273;
+                }
+            } else if (arg0.anInt3358 > 0) {
+                arg0.anInt3358 -= local9.anInt1032;
+                if (arg0.anInt3358 < 0) {
+                    arg0.anInt3358 = 0;
+                }
+            }
+            local273 = arg0.anInt3358 >> 7;
+            if (local273 < 1) {
+                local273 = 1;
+            }
+        }
+        if (local79 < local99) {
+            arg0.xFine += local273;
+            if (local99 < arg0.xFine) {
+                arg0.xFine = local99;
+            }
+        } else if (local79 > local99) {
+            arg0.xFine -= local273;
+            if (local99 > arg0.xFine) {
+                arg0.xFine = local99;
+            }
+        }
+        if (local82 < local116) {
+            arg0.zFine += local273;
+            if (arg0.zFine > local116) {
+                arg0.zFine = local116;
+            }
+        } else if (local116 < local82) {
+            arg0.zFine -= local273;
+            if (local116 > arg0.zFine) {
+                arg0.zFine = local116;
+            }
+        }
+        if (arg0.xFine == local99 && local116 == arg0.zFine) {
+            arg0.movementQueueSize--;
+            if (arg0.anInt3405 > 0) {
+                arg0.anInt3405--;
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!cm", name = "a", descriptor = "(ILclient!fe;)V")
+	public static void method949(@OriginalArg(1) PathingEntity arg0) {
+		if (arg0.anInt3376 == 0) {
+			return;
+		}
+		@Pc(13) BasType local13 = arg0.getBasType();
+		@Pc(43) int local43;
+		@Pc(36) int local36;
+		if (arg0.faceEntity != -1 && arg0.faceEntity < 32768) {
+			@Pc(26) Npc local26 = npcs[arg0.faceEntity];
+			if (local26 != null) {
+				local36 = arg0.zFine - local26.zFine;
+				local43 = arg0.xFine - local26.xFine;
+				if (local43 != 0 || local36 != 0) {
+					arg0.anInt3400 = (int) (Math.atan2((double) local43, (double) local36) * 325.949D) & 0x7FF;
+				}
+			}
+		}
+		@Pc(94) int local94;
+		@Pc(70) int local70;
+		if (arg0.faceEntity >= 32768) {
+			local70 = arg0.faceEntity - 32768;
+			if (local70 == PlayerList.selfId) {
+				local70 = 2047;
+			}
+			@Pc(83) Player local83 = PlayerList.players[local70];
+			if (local83 != null) {
+				local94 = arg0.zFine - local83.zFine;
+				local36 = arg0.xFine - local83.xFine;
+				if (local36 != 0 || local94 != 0) {
+					arg0.anInt3400 = (int) (Math.atan2((double) local36, (double) local94) * 325.949D) & 0x7FF;
+				}
+			}
+		}
+		if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) {
+			local70 = arg0.xFine - (arg0.faceX - Static225.originX - Static225.originX) * 64;
+			local43 = arg0.zFine - (arg0.faceY - Static142.originZ - Static142.originZ) * 64;
+			if (local70 != 0 || local43 != 0) {
+				arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF;
+			}
+			arg0.faceY = 0;
+			arg0.faceX = 0;
+		}
+		local70 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
+		if (local70 == 0) {
+			arg0.anInt3385 = 0;
+			arg0.anInt3414 = 0;
+		} else if (local13.anInt1038 == 0) {
+			arg0.anInt3385++;
+			@Pc(226) boolean local226;
+			if (local70 > 1024) {
+				arg0.anInt3381 -= arg0.anInt3376;
+				local226 = true;
+				if (local70 < arg0.anInt3376 || local70 > 2048 - arg0.anInt3376) {
+					arg0.anInt3381 = arg0.anInt3400;
+					local226 = false;
+				}
+				if (local13.idleAnimationId == arg0.movementSeqId && (arg0.anInt3385 > 25 || local226)) {
+					if (local13.anInt1036 == -1) {
+						arg0.movementSeqId = local13.walkAnimation;
+					} else {
+						arg0.movementSeqId = local13.anInt1036;
+					}
+				}
+			} else {
+				local226 = true;
+				arg0.anInt3381 += arg0.anInt3376;
+				if (arg0.anInt3376 > local70 || local70 > 2048 - arg0.anInt3376) {
+					local226 = false;
+					arg0.anInt3381 = arg0.anInt3400;
+				}
+				if (local13.idleAnimationId == arg0.movementSeqId && (arg0.anInt3385 > 25 || local226)) {
+					if (local13.anInt1067 == -1) {
+						arg0.movementSeqId = local13.walkAnimation;
+					} else {
+						arg0.movementSeqId = local13.anInt1067;
+					}
+				}
+			}
+			arg0.anInt3381 &= 0x7FF;
+		} else {
+			if (local13.idleAnimationId == arg0.movementSeqId && arg0.anInt3385 > 25) {
+				if (local13.anInt1067 == -1) {
+					arg0.movementSeqId = local13.walkAnimation;
+				} else {
+					arg0.movementSeqId = local13.anInt1067;
+				}
+			}
+			local43 = arg0.anInt3400 << 5;
+			if (local43 != arg0.anInt3402) {
+				arg0.anInt3387 = 0;
+				arg0.anInt3402 = local43;
+				local36 = local43 - arg0.anInt3377 & 0xFFFF;
+				local94 = arg0.anInt3414 * arg0.anInt3414 / (local13.anInt1038 * 2);
+				@Pc(471) int local471;
+				if (arg0.anInt3414 > 0 && local36 >= local94 && local36 - local94 < 32768) {
+					arg0.anInt3397 = local36 / 2;
+					arg0.aBoolean167 = true;
+					local471 = local13.anInt1031 * local13.anInt1031 / (local13.anInt1038 * 2);
+					if (local471 > 32767) {
+						local471 = 32767;
+					}
+					if (local471 < arg0.anInt3397) {
+						arg0.anInt3397 = local36 - local471;
+					}
+				} else if (arg0.anInt3414 < 0 && local94 <= 65536 - local36 && 65536 - local36 - local94 < 32768) {
+					arg0.anInt3397 = (65536 - local36) / 2;
+					arg0.aBoolean167 = true;
+					local471 = local13.anInt1031 * local13.anInt1031 / (local13.anInt1038 * 2);
+					if (local471 > 32767) {
+						local471 = 32767;
+					}
+					if (local471 < arg0.anInt3397) {
+						arg0.anInt3397 = 65536 - local36 - local471;
+					}
+				} else {
+					arg0.aBoolean167 = false;
+				}
+			}
+			if (arg0.anInt3414 == 0) {
+				local36 = arg0.anInt3402 - arg0.anInt3377 & 0xFFFF;
+				if (local36 < local13.anInt1038) {
+					arg0.anInt3377 = arg0.anInt3402;
+				} else {
+					arg0.anInt3387 = 0;
+					local94 = local13.anInt1031 * local13.anInt1031 / (local13.anInt1038 * 2);
+					arg0.aBoolean167 = true;
+					if (local94 > 32767) {
+						local94 = 32767;
+					}
+					if (local36 >= 32768) {
+						arg0.anInt3414 = -local13.anInt1038;
+						arg0.anInt3397 = (65536 - local36) / 2;
+						if (local94 < arg0.anInt3397) {
+							arg0.anInt3397 = 65536 - local36 - local94;
+						}
+					} else {
+						arg0.anInt3414 = local13.anInt1038;
+						arg0.anInt3397 = local36 / 2;
+						if (local94 < arg0.anInt3397) {
+							arg0.anInt3397 = local36 - local94;
+						}
+					}
+				}
+			} else if (arg0.anInt3414 <= 0) {
+				if (arg0.anInt3387 >= arg0.anInt3397) {
+					arg0.aBoolean167 = false;
+				}
+				if (!arg0.aBoolean167) {
+					arg0.anInt3414 += local13.anInt1038;
+					if (arg0.anInt3414 > 0) {
+						arg0.anInt3414 = 0;
+					}
+				} else if (-local13.anInt1031 < arg0.anInt3414) {
+					arg0.anInt3414 -= local13.anInt1038;
+				}
+			} else {
+				if (arg0.anInt3397 <= arg0.anInt3387) {
+					arg0.aBoolean167 = false;
+				}
+				if (!arg0.aBoolean167) {
+					arg0.anInt3414 -= local13.anInt1038;
+					if (arg0.anInt3414 < 0) {
+						arg0.anInt3414 = 0;
+					}
+				} else if (arg0.anInt3414 < local13.anInt1031) {
+					arg0.anInt3414 += local13.anInt1038;
+				}
+			}
+			arg0.anInt3377 += arg0.anInt3414;
+			arg0.anInt3377 &= 0xFFFF;
+			if (arg0.anInt3414 <= 0) {
+				arg0.anInt3387 -= arg0.anInt3414;
+			} else {
+				arg0.anInt3387 += arg0.anInt3414;
+			}
+			arg0.anInt3381 = arg0.anInt3377 >> 5;
+		}
+	}
+
+    @OriginalMember(owner = "client!ck", name = "a", descriptor = "(Lclient!fe;I)V")
+	public static void method879(@OriginalArg(0) PathingEntity arg0) {
+		arg0.aBoolean171 = false;
+		@Pc(18) SeqType local18;
+		if (arg0.movementSeqId != -1) {
+			local18 = SeqTypeList.get(arg0.movementSeqId);
+			if (local18 == null || local18.frames == null) {
+				arg0.movementSeqId = -1;
+			} else {
+				arg0.anInt3396++;
+				if (local18.frames.length > arg0.anInt3407 && arg0.anInt3396 > local18.anIntArray474[arg0.anInt3407]) {
+					arg0.anInt3396 = 1;
+					arg0.anInt3407++;
+					arg0.anInt3388++;
+					SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, arg0 == PlayerList.self, arg0.anInt3407);
+				}
+				if (arg0.anInt3407 >= local18.frames.length) {
+					arg0.anInt3407 = 0;
+					arg0.anInt3396 = 0;
+					SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, PlayerList.self == arg0, arg0.anInt3407);
+				}
+				arg0.anInt3388 = arg0.anInt3407 + 1;
+				if (arg0.anInt3388 >= local18.frames.length) {
+					arg0.anInt3388 = 0;
+				}
+			}
+		}
+		@Pc(156) int local156;
+		if (arg0.spotAnimId != -1 && client.loop >= arg0.spotAnimStart) {
+			local156 = SpotAnimTypeList.get(arg0.spotAnimId).seqId;
+			if (local156 == -1) {
+				arg0.spotAnimId = -1;
+			} else {
+				@Pc(165) SeqType local165 = SeqTypeList.get(local156);
+				if (local165 == null || local165.frames == null) {
+					arg0.spotAnimId = -1;
+				} else {
+					if (arg0.anInt3399 < 0) {
+						arg0.anInt3399 = 0;
+						SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, 0);
+					}
+					arg0.anInt3361++;
+					if (arg0.anInt3399 < local165.frames.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) {
+						arg0.anInt3399++;
+						arg0.anInt3361 = 1;
+						SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, arg0.anInt3399);
+					}
+					if (arg0.anInt3399 >= local165.frames.length) {
+						arg0.spotAnimId = -1;
+					}
+					arg0.anInt3418 = arg0.anInt3399 + 1;
+					if (local165.frames.length <= arg0.anInt3418) {
+						arg0.anInt3418 = -1;
+					}
+				}
+			}
+		}
+		if (arg0.seqId != -1 && arg0.anInt3420 <= 1) {
+			local18 = SeqTypeList.get(arg0.seqId);
+			if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && client.loop >= arg0.anInt3395 && client.loop > arg0.anInt3386) {
+				arg0.anInt3420 = 1;
+				return;
+			}
+		}
+		if (arg0.seqId != -1 && arg0.anInt3420 == 0) {
+			local18 = SeqTypeList.get(arg0.seqId);
+			if (local18 == null || local18.frames == null) {
+				arg0.seqId = -1;
+			} else {
+				arg0.anInt3360++;
+				if (arg0.anInt3425 < local18.frames.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) {
+					arg0.anInt3360 = 1;
+					arg0.anInt3425++;
+					SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, arg0 == PlayerList.self, arg0.anInt3425);
+				}
+				if (local18.frames.length <= arg0.anInt3425) {
+					arg0.anInt3425 -= local18.anInt5362;
+					arg0.anInt3371++;
+					if (arg0.anInt3371 >= local18.anInt5357) {
+						arg0.seqId = -1;
+					} else if (arg0.anInt3425 >= 0 && local18.frames.length > arg0.anInt3425) {
+						SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, PlayerList.self == arg0, arg0.anInt3425);
+					} else {
+						arg0.seqId = -1;
+					}
+				}
+				arg0.anInt3373 = arg0.anInt3425 + 1;
+				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.frames.length) {
+						arg0.anInt3373 = -1;
+					}
+				}
+				arg0.aBoolean171 = local18.aBoolean279;
+			}
+		}
+		if (arg0.anInt3420 > 0) {
+			arg0.anInt3420--;
+		}
+		for (local156 = 0; local156 < arg0.aClass147Array3.length; local156++) {
+			@Pc(545) Npc_Class147 local545 = arg0.aClass147Array3[local156];
+			if (local545 != null) {
+				if (local545.anInt5408 > 0) {
+					local545.anInt5408--;
+				} else {
+					@Pc(570) SeqType local570 = SeqTypeList.get(local545.anInt5396);
+					if (local570 == null || local570.frames == null) {
+						arg0.aClass147Array3[local156] = null;
+					} else {
+						local545.anInt5404++;
+						if (local545.anInt5399 < local570.frames.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) {
+							local545.anInt5399++;
+							local545.anInt5404 = 1;
+							SoundPlayer.playSeqSound(arg0.zFine, local570, arg0.xFine, arg0 == PlayerList.self, 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.frames.length) {
+								SoundPlayer.playSeqSound(arg0.zFine, local570, arg0.xFine, PlayerList.self == arg0, local545.anInt5399);
+							} else {
+								arg0.aClass147Array3[local156] = null;
+							}
+						}
+						local545.anInt5398 = local545.anInt5399 + 1;
+						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.frames.length <= local545.anInt5398) {
+								local545.anInt5398 = -1;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }

client/src/main/java/rt4/NpcType.java

@@ -8,6 +8,20 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!me")
 public final class NpcType {
 
+	@OriginalMember(owner = "client!id", name = "e", descriptor = "[I")
+	public static final int[] anIntArray259 = new int[14];
+	@OriginalMember(owner = "client!lg", name = "c", descriptor = "[Lclient!tk;")
+	public static final SeqType[] aClass144Array1 = new SeqType[14];
+	@OriginalMember(owner = "client!ag", name = "cb", descriptor = "[Lclient!cl;")
+	public static final AnimFrameset[] aClass3_Sub2_Sub7Array1 = new AnimFrameset[14];
+	@OriginalMember(owner = "client!fk", name = "k", descriptor = "[I")
+	public static final int[] anIntArray147 = new int[14];
+	@OriginalMember(owner = "client!rg", name = "A", descriptor = "[I")
+	public static final int[] anIntArray492 = new int[14];
+	@OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;")
+	public static final AnimFrameset[] aClass3_Sub2_Sub7Array5 = new AnimFrameset[14];
+	@OriginalMember(owner = "client!en", name = "t", descriptor = "[I")
+	public static final int[] anIntArray148 = new int[14];
 	@OriginalMember(owner = "client!me", name = "b", descriptor = "[S")
 	private short[] retextureSource;
 
@@ -347,35 +361,35 @@ public final class NpcType {
 			if (seqs[local235] != null) {
 				@Pc(753) SeqType local753 = SeqTypeList.get(seqs[local235].anInt5396);
 				if (local753.frames != null) {
-					Static146.aClass144Array1[local235] = local753;
+					aClass144Array1[local235] = local753;
 					local207 = seqs[local235].anInt5398;
 					local46 = true;
 					local200 = seqs[local235].anInt5399;
 					local214 = local753.frames[local200];
-					Static6.aClass3_Sub2_Sub7Array1[local235] = SeqTypeList.getAnimFrameset(local214 >>> 16);
+					aClass3_Sub2_Sub7Array1[local235] = SeqTypeList.getAnimFrameset(local214 >>> 16);
 					local214 &= 0xFFFF;
-					Static107.anIntArray259[local235] = local214;
+					anIntArray259[local235] = local214;
-					if (Static6.aClass3_Sub2_Sub7Array1[local235] != null) {
+					if (aClass3_Sub2_Sub7Array1[local235] != null) {
-						local723 |= Static6.aClass3_Sub2_Sub7Array1[local235].isColorTransformed(local214);
+						local723 |= aClass3_Sub2_Sub7Array1[local235].isColorTransformed(local214);
-						local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
+						local721 |= aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
 						local725 |= local753.aBoolean278;
 					}
 					if ((local753.tween || SeqType.applyTweening) && local207 != -1 && local753.frames.length > local207) {
-						Static71.anIntArray147[local235] = local753.anIntArray474[local200];
+						anIntArray147[local235] = local753.anIntArray474[local200];
-						Static214.anIntArray492[local235] = seqs[local235].anInt5404;
+						anIntArray492[local235] = seqs[local235].anInt5404;
 						local228 = local753.frames[local207];
-						Static131.aClass3_Sub2_Sub7Array5[local235] = SeqTypeList.getAnimFrameset(local228 >>> 16);
+						aClass3_Sub2_Sub7Array5[local235] = SeqTypeList.getAnimFrameset(local228 >>> 16);
 						local228 &= 0xFFFF;
-						Static61.anIntArray148[local235] = local228;
+						anIntArray148[local235] = local228;
-						if (Static131.aClass3_Sub2_Sub7Array5[local235] != null) {
+						if (aClass3_Sub2_Sub7Array5[local235] != null) {
-							local723 |= Static131.aClass3_Sub2_Sub7Array5[local235].isColorTransformed(local228);
+							local723 |= aClass3_Sub2_Sub7Array5[local235].isColorTransformed(local228);
-							local721 |= Static131.aClass3_Sub2_Sub7Array5[local235].isAlphaTransformed(local228);
+							local721 |= aClass3_Sub2_Sub7Array5[local235].isAlphaTransformed(local228);
 						}
 					} else {
-						Static71.anIntArray147[local235] = 0;
+						anIntArray147[local235] = 0;
-						Static214.anIntArray492[local235] = 0;
+						anIntArray492[local235] = 0;
-						Static131.aClass3_Sub2_Sub7Array5[local235] = null;
+						aClass3_Sub2_Sub7Array5[local235] = null;
-						Static61.anIntArray148[local235] = -1;
+						anIntArray148[local235] = -1;
 					}
 				}
 			}
@@ -453,8 +467,8 @@ public final class NpcType {
 		@Pc(1218) Model local1218 = local40.method4572(!local721, !local723, !local725);
 		local330 = 1;
 		for (local318 = 0; local318 < local173; local318++) {
-			if (Static6.aClass3_Sub2_Sub7Array1[local318] != null) {
+			if (aClass3_Sub2_Sub7Array1[local318] != null) {
-				local1218.method4565(Static6.aClass3_Sub2_Sub7Array1[local318], Static107.anIntArray259[local318], Static131.aClass3_Sub2_Sub7Array5[local318], Static61.anIntArray148[local318], Static214.anIntArray492[local318] - 1, Static71.anIntArray147[local318], local330, Static146.aClass144Array1[local318].aBoolean278, this.anIntArrayArray28[local318]);
+				local1218.method4565(aClass3_Sub2_Sub7Array1[local318], anIntArray259[local318], aClass3_Sub2_Sub7Array5[local318], anIntArray148[local318], anIntArray492[local318] - 1, anIntArray147[local318], local330, aClass144Array1[local318].aBoolean278, this.anIntArrayArray28[local318]);
 			}
 			local330 <<= 0x1;
 		}
@@ -466,9 +480,9 @@ public final class NpcType {
 			local1218.method4558(local1088, local228, local1092, local1040, arg7 - 1, local300, seqType1.aBoolean278);
 		}
 		for (local318 = 0; local318 < local173; local318++) {
-			Static6.aClass3_Sub2_Sub7Array1[local318] = null;
+			aClass3_Sub2_Sub7Array1[local318] = null;
-			Static131.aClass3_Sub2_Sub7Array5[local318] = null;
+			aClass3_Sub2_Sub7Array5[local318] = null;
-			Static146.aClass144Array1[local318] = null;
+			aClass144Array1[local318] = null;
 		}
 		if (this.anInt3729 != 128 || this.anInt3731 != 128) {
 			local1218.resize(this.anInt3729, this.anInt3731, this.anInt3729);

client/src/main/java/rt4/Protocol.java

@@ -5,6 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 public class Protocol {
     @OriginalMember(owner = "client!eg", name = "e", descriptor = "Lclient!i;")
@@ -25,6 +26,8 @@ public class Protocol {
     public static final JagString TRADEREQ = JagString.parse(":tradereq:");
     @OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
 	public static final JagString CLAN = JagString.parse(":clan:");
+    @OriginalMember(owner = "client!ij", name = "a", descriptor = "Lclient!na;")
+    public static final JagString DUELFRIEND = JagString.parse(":duelfriend:");
     @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
     public static BufferedSocket socket;
     @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;")
@@ -73,10 +76,10 @@ public class Protocol {
                 @Pc(122) ObjStack local122 = new ObjStack();
                 local122.anInt5550 = local31;
                 local122.type = local15;
-                if (Static159.objStacks[Player.level][local19][local27] == null) {
+                if (SceneGraph.objStacks[Player.level][local19][local27] == null) {
-                    Static159.objStacks[Player.level][local19][local27] = new LinkedList();
+                    SceneGraph.objStacks[Player.level][local19][local27] = new LinkedList();
                 }
-                Static159.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local122));
+                SceneGraph.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local122));
                 Static220.spawnGroundObject(local27, local19);
             }
         } else if (opcode == ServerProt.LOCATION_PACKET_121) {
@@ -169,7 +172,7 @@ public class Protocol {
             int local31 = inboundBuffer.g2();
             int local39 = inboundBuffer.g2();
             if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
-                @Pc(710) LinkedList local710 = Static159.objStacks[Player.level][local23][local19];
+                @Pc(710) LinkedList local710 = SceneGraph.objStacks[Player.level][local23][local19];
                 if (local710 != null) {
                     for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.head(); local718 != null; local718 = (ObjStackNode) local710.next()) {
                         @Pc(723) ObjStack local723 = local718.value;
@@ -192,10 +195,10 @@ public class Protocol {
                 @Pc(812) ObjStack local812 = new ObjStack();
                 local812.anInt5550 = local31;
                 local812.type = local39;
-                if (Static159.objStacks[Player.level][local19][local27] == null) {
+                if (SceneGraph.objStacks[Player.level][local19][local27] == null) {
-                    Static159.objStacks[Player.level][local19][local27] = new LinkedList();
+                    SceneGraph.objStacks[Player.level][local19][local27] = new LinkedList();
                 }
-                Static159.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local812));
+                SceneGraph.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local812));
                 Static220.spawnGroundObject(local27, local19);
             }
         } else if (opcode == ServerProt.LOCATION_PACKET_16) {
@@ -315,7 +318,7 @@ public class Protocol {
             int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX;
             int local27 = inboundBuffer.g2();
             if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
-                @Pc(1565) LinkedList local1565 = Static159.objStacks[Player.level][local23][local19];
+                @Pc(1565) LinkedList local1565 = SceneGraph.objStacks[Player.level][local23][local19];
                 if (local1565 != null) {
                     for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.head(); local1572 != null; local1572 = (ObjStackNode) local1565.next()) {
                         if (local1572.value.type == (local27 & 0x7FFF)) {
@@ -324,7 +327,7 @@ public class Protocol {
                         }
                     }
                     if (local1565.head() == null) {
-                        Static159.objStacks[Player.level][local23][local19] = null;
+                        SceneGraph.objStacks[Player.level][local23][local19] = null;
                     }
                     Static220.spawnGroundObject(local19, local23);
                 }
@@ -967,7 +970,7 @@ public class Protocol {
                 if (!ignored && Player.inTutorialIsland == 0) {
                     Chat.add(name, 14, JagString.EMPTY);
                 }
-            } else if (message.endsWith(Static112.DUELFRIEND)) {
+            } else if (message.endsWith(DUELFRIEND)) {
                 JagString name = message.substring(message.indexOf(Static264.COLON), 0);
                 long name37 = name.encode37();
                 boolean ignored = false;
@@ -1444,8 +1447,8 @@ public class Protocol {
             Static180.currentChunkZ = inboundBuffer.g1neg();
             for (int x = Static115.currentChunkX; x < Static115.currentChunkX + 8; x++) {
                 for (int z = Static180.currentChunkZ; z < Static180.currentChunkZ + 8; z++) {
-                    if (Static159.objStacks[Player.level][x][z] != null) {
+                    if (SceneGraph.objStacks[Player.level][x][z] != null) {
-                        Static159.objStacks[Player.level][x][z] = null;
+                        SceneGraph.objStacks[Player.level][x][z] = null;
                         Static220.spawnGroundObject(z, x);
                     }
                 }
@@ -1759,7 +1762,7 @@ public class Protocol {
             } else {
                 Static175.url = url;
                 Static164.newTab = true;
-                Static33.openUrlRequest = GameShell.signLink.openUrl(new String(url.method3148(), "ISO-8859-1"));
+                Static33.openUrlRequest = GameShell.signLink.openUrl(new String(url.method3148(), StandardCharsets.ISO_8859_1));
             }
             opcode = -1;
             return true;
@@ -2496,7 +2499,7 @@ public class Protocol {
             return;
         }
         Static71.method1444();
-        Static109.method2274();
+        NpcList.method2274();
         OverheadChat.loop();
         if (WorldMap.component != null) {
             WorldMap.method447();
@@ -2810,9 +2813,9 @@ public class Protocol {
                                             if (Static227.cameraType == 1) {
                                                 Static250.method4273();
                                             } else if (Static227.cameraType == 2) {
-                                                Static125.updateLockedCamera();
+                                                Camera.updateLockedCamera();
                                             } else {
-                                                Static40.updateLoginScreenCamera();
+                                                Camera.updateLoginScreenCamera();
                                             }
                                             for (y = 0; y < 5; y++) {
                                                 @Pc(2001) int local2001 = Static31.anIntArray76[y]++;

client/src/main/java/rt4/ReflectionCheck.java

@@ -13,7 +13,9 @@ import java.lang.reflect.Method;
 @OriginalClass("client!ed")
 public final class ReflectionCheck extends Node {
 
-	@OriginalMember(owner = "client!ed", name = "p", descriptor = "I")
+    @OriginalMember(owner = "client!qi", name = "u", descriptor = "Lclient!ih;")
+    public static LinkedList aClass69_113 = new LinkedList();
+    @OriginalMember(owner = "client!ed", name = "p", descriptor = "I")
 	public int anInt1725;
 
 	@OriginalMember(owner = "client!ed", name = "u", descriptor = "[Lsignlink!im;")
@@ -40,7 +42,7 @@ public final class ReflectionCheck extends Node {
     @OriginalMember(owner = "client!t", name = "a", descriptor = "(Lclient!i;II)V")
     public static void loop(@OriginalArg(0) Packet arg0) {
         while (true) {
-            @Pc(18) ReflectionCheck local18 = (ReflectionCheck) Static204.aClass69_113.head();
+            @Pc(18) ReflectionCheck local18 = (ReflectionCheck) aClass69_113.head();
             if (local18 == null) {
                 return;
             }
@@ -218,6 +220,11 @@ public final class ReflectionCheck extends Node {
 				local17.anIntArray138[local59] = -5;
 			}
 		}
-		Static204.aClass69_113.addTail(local17);
+		aClass69_113.addTail(local17);
 	}
+
+    @OriginalMember(owner = "client!j", name = "c", descriptor = "(I)V")
+    public static void method4625() {
+        aClass69_113 = new LinkedList();
+    }
 }

client/src/main/java/rt4/SceneGraph.java

@@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
 public class SceneGraph {
     @OriginalMember(owner = "client!bb", name = "g", descriptor = "[[[B")
     public static final byte[][][] tileFlags = new byte[4][104][104];
+    @OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;")
+	public static final LinkedList[][][] objStacks = new LinkedList[4][104][104];
     @OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
     public static Tile[][][] tiles;
 

client/src/main/java/rt4/ScriptRunner.java

@@ -1,6 +1,7 @@
 package rt4;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Calendar;
 import java.util.Date;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
@@ -24,6 +25,12 @@ public final class ScriptRunner {
 	public static final JagString aClass100_446 = JagString.parse("<img=0>");
 	@OriginalMember(owner = "client!nd", name = "b", descriptor = "Lclient!na;")
 	public static final JagString aClass100_780 = JagString.parse("Clientscript error in: ");
+	@OriginalMember(owner = "client!hm", name = "R", descriptor = "Lclient!na;")
+	public static final JagString aClass100_537 = JagString.parse("<img=1>");
+	@OriginalMember(owner = "client!hn", name = "K", descriptor = "Ljava/util/Calendar;")
+	public static final Calendar aCalendar2 = Calendar.getInstance();
+	@OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;")
+	public static final JagString CS_ERROR = JagString.parse("Clientscript error )2 check log for details");
 	@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
 	public static QuickChatPhrase activePhrase;
 	@OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;")
@@ -1679,7 +1686,7 @@ public final class ScriptRunner {
 									if (opcode == 3609) {
 										ssp--;
 										string = stringStack[ssp];
-										if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+										if (string.startsWith(aClass100_446) || string.startsWith(aClass100_537)) {
 											string = string.substring(7);
 										}
 										intStack[isp++] = FriendsList.contains(string) ? 1 : 0;
@@ -1786,7 +1793,7 @@ public final class ScriptRunner {
 									if (opcode == 3623) {
 										ssp--;
 										string = stringStack[ssp];
-										if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+										if (string.startsWith(aClass100_446) || string.startsWith(aClass100_537)) {
 											string = string.substring(7);
 										}
 										intStack[isp++] = IgnoreList.contains(string) ? 1 : 0;
@@ -1833,10 +1840,10 @@ public final class ScriptRunner {
 									if (opcode == 3628) {
 										ssp--;
 										string = stringStack[ssp];
-										if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+										if (string.startsWith(aClass100_446) || string.startsWith(aClass100_537)) {
 											string = string.substring(7);
 										}
-										intStack[isp++] = Static4.method25(string);
+										intStack[isp++] = FriendsList.method25(string);
 										continue;
 									}
 									if (opcode == 3629) {
@@ -2677,16 +2684,16 @@ public final class ScriptRunner {
 													}
 													if (opcode == 5202) {
 														isp--;
-														Static258.method4444(intStack[isp]);
+														WorldMap.method4444(intStack[isp]);
 														continue;
 													}
 													if (opcode == 5203) {
 														ssp--;
-														Static3.method4656(stringStack[ssp]);
+														WorldMap.method4656(stringStack[ssp]);
 														continue;
 													}
 													if (opcode == 5204) {
-														stringStack[ssp - 1] = Static211.method923(stringStack[ssp - 1]);
+														stringStack[ssp - 1] = WorldMap.method923(stringStack[ssp - 1]);
 														continue;
 													}
 													if (opcode == 5205) {
@@ -2717,8 +2724,8 @@ public final class ScriptRunner {
 														continue;
 													}
 													if (opcode == 5208) {
-														intStack[isp++] = Static89.anInt2387;
+														intStack[isp++] = WorldMap.anInt2387;
-														intStack[isp++] = Static37.anInt1176;
+														intStack[isp++] = WorldMap.anInt1176;
 														continue;
 													}
 													if (opcode == 5209) {
@@ -2727,7 +2734,7 @@ public final class ScriptRunner {
 														continue;
 													}
 													if (opcode == 5210) {
-														local7293 = Static214.method4361();
+														local7293 = WorldMap.method4361();
 														if (local7293 == null) {
 															intStack[isp++] = 0;
 															intStack[isp++] = 0;
@@ -2738,7 +2745,7 @@ public final class ScriptRunner {
 														continue;
 													}
 													if (opcode == 5211) {
-														local7293 = Static214.method4361();
+														local7293 = WorldMap.method4361();
 														if (local7293 == null) {
 															intStack[isp++] = 0;
 															intStack[isp++] = 0;
@@ -2749,7 +2756,7 @@ public final class ScriptRunner {
 														continue;
 													}
 													if (opcode == 5212) {
-														int1 = Static118.method2352();
+														int1 = WorldMap.method2352();
 														int2 = 0;
 														if (int1 == -1) {
 															local2522 = EMPTY_STRING;
@@ -2764,7 +2771,7 @@ public final class ScriptRunner {
 													}
 													if (opcode == 5213) {
 														int2 = 0;
-														int1 = Static119.method2385();
+														int1 = WorldMap.method2385();
 														if (int1 == -1) {
 															local2522 = EMPTY_STRING;
 														} else {
@@ -2779,7 +2786,7 @@ public final class ScriptRunner {
 													if (opcode == 5214) {
 														isp--;
 														int1 = intStack[isp];
-														Static80.method3616(int1 >> 14 & 0x3FFF, int1 & 0x3FFF);
+														WorldMap.method3616(int1 >> 14 & 0x3FFF, int1 & 0x3FFF);
 														continue;
 													}
 													if (opcode == 5215) {
@@ -2805,13 +2812,13 @@ public final class ScriptRunner {
 													if (opcode == 5216) {
 														isp--;
 														int1 = intStack[isp];
-														Static253.method4332(int1);
+														MapList.method4332(int1);
 														continue;
 													}
 													if (opcode == 5217) {
 														isp--;
 														int1 = intStack[isp];
-														if (Static90.method1855(int1)) {
+														if (MapList.method1855(int1)) {
 															intStack[isp++] = 1;
 														} else {
 															intStack[isp++] = 0;
@@ -2819,7 +2826,7 @@ public final class ScriptRunner {
 														continue;
 													}
 													if (opcode == 5218) {
-														local7293 = Static214.method4361();
+														local7293 = WorldMap.method4361();
 														if (local7293 == null) {
 															intStack[isp++] = -1;
 														} else {
@@ -2829,7 +2836,7 @@ public final class ScriptRunner {
 													}
 													if (opcode == 5219) {
 														ssp--;
-														Static44.method1149(stringStack[ssp]);
+														WorldMap.method1149(stringStack[ssp]);
 														continue;
 													}
 													if (opcode == 5220) {
@@ -2975,12 +2982,9 @@ public final class ScriptRunner {
 														string = EMPTY_STRING;
 														if (Player.lastLogAddress != null) {
 															string = Static181.method3341(Player.lastLogAddress.intArg2);
-															try {
+															if (Player.lastLogAddress.result != null) {
-																if (Player.lastLogAddress.result != null) {
+																@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
-																	@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
+																string = JagString.decodeString(local8281, local8281.length, 0);
-																	string = JagString.decodeString(local8281, local8281.length, 0);
-																}
-															} catch (@Pc(8290) UnsupportedEncodingException local8290) {
 															}
 														}
 														stringStack[ssp++] = string;
@@ -3002,7 +3006,7 @@ public final class ScriptRunner {
 														if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !client.haveIe6) {
 															Static164.newTab = local1552;
 															Static175.url = local8356;
-															Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local8356.method3148(), "ISO-8859-1"));
+															Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local8356.method3148(), StandardCharsets.ISO_8859_1));
 															continue;
 														}
 														Static169.openUrl(local8356, local1552);
@@ -3656,16 +3660,16 @@ public final class ScriptRunner {
 														int2 = intStack[isp + 2];
 														int3 = intStack[isp + 1];
 														int1 = intStack[isp];
-														Static102.aCalendar2.clear();
+														aCalendar2.clear();
-														Static102.aCalendar2.set(11, 12);
+														aCalendar2.set(11, 12);
-														Static102.aCalendar2.set(int2, int3, int1);
+														aCalendar2.set(int2, int3, int1);
-														intStack[isp++] = (int) (Static102.aCalendar2.getTime().getTime() / 86400000L) - 11745;
+														intStack[isp++] = (int) (aCalendar2.getTime().getTime() / 86400000L) - 11745;
 														continue;
 													}
 													if (opcode == 6303) {
-														Static102.aCalendar2.clear();
+														aCalendar2.clear();
-														Static102.aCalendar2.setTime(new Date(MonotonicClock.currentTimeMillis()));
+														aCalendar2.setTime(new Date(MonotonicClock.currentTimeMillis()));
-														intStack[isp++] = Static102.aCalendar2.get(1);
+														intStack[isp++] = aCalendar2.get(1);
 														continue;
 													}
 													if (opcode == 6304) {
@@ -3853,7 +3857,7 @@ public final class ScriptRunner {
 										string = stringStack[ssp];
 										isp--;
 										int3 = intStack[isp];
-										stringStack[ssp++] = JagString.concatenate(new JagString[] { string, Static110.method2285(int3) });
+										stringStack[ssp++] = JagString.concatenate(new JagString[] { string, JagString.parseIntTrue(int3) });
 										continue;
 									}
 									if (opcode == 4103) {
@@ -3866,10 +3870,10 @@ public final class ScriptRunner {
 										isp--;
 										int1 = intStack[isp];
 										@Pc(11770) long local11770 = (long) int1 * 86400000L + 1014768000000L;
-										Static102.aCalendar2.setTime(new Date(local11770));
+										aCalendar2.setTime(new Date(local11770));
-										local652 = Static102.aCalendar2.get(5);
+										local652 = aCalendar2.get(5);
-										c = Static102.aCalendar2.get(2);
+										c = aCalendar2.get(2);
-										local1087 = Static102.aCalendar2.get(1);
+										local1087 = aCalendar2.get(1);
 										stringStack[ssp++] = JagString.concatenate(new JagString[] { JagString.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, JagString.parseInt(local1087) });
 										continue;
 									}
@@ -4140,7 +4144,7 @@ public final class ScriptRunner {
 		} catch (@Pc(14378) Exception ex) {
 			if (script.name == null) {
 				if (client.modeWhere != 0) {
-					Chat.add(EMPTY_STRING, 0, Static136.CS_ERROR);
+					Chat.add(EMPTY_STRING, 0, CS_ERROR);
 				}
 				TracingException.report("CS2 - scr:" + script.key + " op:" + op, ex);
 			} else {

client/src/main/java/rt4/SoftwareAlphaSprite.java

@@ -856,7 +856,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
 
 	@OriginalMember(owner = "client!am", name = "d", descriptor = "(II)V")
 	@Override
-	public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final void renderHorizontalFlipTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		arg0 += this.anInt1860 - this.width - this.anInt1863;
 		arg1 += this.anInt1861;
 		@Pc(21) int local21 = arg0 + arg1 * SoftwareRaster.width;

client/src/main/java/rt4/SoftwareFont.java

@@ -126,6 +126,22 @@ public final class SoftwareFont extends Font {
 		}
 	}
 
+    @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
+	public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) {
+		return SpriteLoader.decode(arg2, 0, arg0) ? method4635(arg1.getFile(arg0, 0)) : null;
+	}
+
+	@OriginalMember(owner = "client!j", name = "a", descriptor = "([BI)Lclient!dd;")
+	public static SoftwareFont method4635(@OriginalArg(0) byte[] arg0) {
+		if (arg0 == null) {
+			return null;
+		} else {
+			@Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
+			SpriteLoader.clear();
+			return local22;
+		}
+	}
+
 	@OriginalMember(owner = "client!dd", name = "a", descriptor = "(IIIIIIIZ)V")
 	@Override
 	protected final void renderGlyphTransparent(@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) {

client/src/main/java/rt4/SoftwareRaster.java

@@ -51,7 +51,7 @@ public final class SoftwareRaster {
 	}
 
 	@OriginalMember(owner = "client!kb", name = "a", descriptor = "(IIIIII)V")
-	public static void method2484(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+	public static void fillRectAlpha(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
 		if (arg0 < clipLeft) {
 			arg2 -= clipLeft - arg0;
 			arg0 = clipLeft;

client/src/main/java/rt4/SoftwareSprite.java

@@ -203,10 +203,33 @@ public class SoftwareSprite extends Sprite {
 
     @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!ve;IIB)Lclient!mm;")
     public static SoftwareSprite loadSoftwareAlphaSprite(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) {
-        return SpriteLoader.decode(arg0, 0, arg1) ? Static102.method2071() : null;
+        return SpriteLoader.decode(arg0, 0, arg1) ? method2071() : null;
     }
 
-    @OriginalMember(owner = "client!mm", name = "d", descriptor = "(I)V")
+	@OriginalMember(owner = "client!hn", name = "d", descriptor = "(I)Lclient!mm;")
+	public static SoftwareSprite method2071() {
+		@Pc(13) int local13 = SpriteLoader.innerHeights[0] * SpriteLoader.innerWidths[0];
+		@Pc(17) byte[] local17 = SpriteLoader.pixels[0];
+		@Pc(78) SoftwareSprite local78;
+		if (SpriteLoader.hasAlpha[0]) {
+			@Pc(30) byte[] local30 = SpriteLoader.alpha[0];
+			@Pc(33) int[] local33 = new int[local13];
+			for (@Pc(35) int local35 = 0; local35 < local13; local35++) {
+				local33[local35] = (local30[local35] & 0xFF) << 24 | SpriteLoader.palette[local17[local35] & 0xFF];
+			}
+			local78 = new SoftwareAlphaSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local33);
+		} else {
+			@Pc(83) int[] local83 = new int[local13];
+			for (@Pc(85) int local85 = 0; local85 < local13; local85++) {
+				local83[local85] = SpriteLoader.palette[local17[local85] & 0xFF];
+			}
+			local78 = new SoftwareSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local83);
+		}
+		SpriteLoader.clear();
+		return local78;
+	}
+
+	@OriginalMember(owner = "client!mm", name = "d", descriptor = "(I)V")
 	public final void method298(@OriginalArg(0) int arg0) {
 		if (this.width == this.anInt1860 && this.height == this.anInt1866) {
 			return;
@@ -822,7 +845,7 @@ public class SoftwareSprite extends Sprite {
 
 	@OriginalMember(owner = "client!mm", name = "d", descriptor = "(II)V")
 	@Override
-	public void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public void renderHorizontalFlipTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		arg0 += this.anInt1860 - this.width - this.anInt1863;
 		arg1 += this.anInt1861;
 		@Pc(21) int local21 = arg0 + arg1 * SoftwareRaster.width;

client/src/main/java/rt4/Sprite.java

@@ -52,7 +52,7 @@ public abstract class Sprite extends SecondaryNode {
 	}
 
 	@OriginalMember(owner = "client!qf", name = "d", descriptor = "(II)V")
-	public abstract void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
+	public abstract void renderHorizontalFlipTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
 
 	@OriginalMember(owner = "client!qf", name = "b", descriptor = "(IIIII)V")
 	public abstract void method1422(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4);

client/src/main/java/rt4/Static1.java

@@ -553,18 +553,18 @@ public final class Static1 {
 		}
 		WorldMap.aClass3_Sub2_Sub1_2.method1415(arg0, arg3);
 		@Pc(147) int local147 = arg1 * Static109.anInt2884 / WorldMap.length + arg3;
-		@Pc(153) int local153 = Static37.anInt1176 * arg1 / WorldMap.length;
+		@Pc(153) int local153 = WorldMap.anInt1176 * arg1 / WorldMap.length;
 		@Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / WorldMap.width;
-		@Pc(167) int local167 = arg2 * Static89.anInt2387 / WorldMap.width;
+		@Pc(167) int local167 = arg2 * WorldMap.anInt2387 / WorldMap.width;
 		@Pc(169) int local169 = 16711680;
 		if (client.game == 1) {
 			local169 = 16777215;
 		}
 		if (GlRenderer.enabled) {
-			GlRaster.method1182(local161, local147, local167, local153, local169, 128);
+			GlRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
 			GlRaster.method1179(local161, local147, local167, local153, local169);
 		} else {
-			SoftwareRaster.method2484(local161, local147, local167, local153, local169, 128);
+			SoftwareRaster.fillRectAlpha(local161, local147, local167, local153, local169, 128);
 			SoftwareRaster.drawRect(local161, local147, local167, local153, local169);
 		}
 		if (Static201.anInt1864 <= 0) {
@@ -581,9 +581,9 @@ public final class Static1 {
 				@Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / WorldMap.length;
 				@Pc(267) int local267 = arg2 * local238.anInt4307 / WorldMap.width + arg0;
 				if (GlRenderer.enabled) {
-					GlRaster.method1182(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
+					GlRaster.fillRectAlpha(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
 				} else {
-					SoftwareRaster.method2484(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
+					SoftwareRaster.fillRectAlpha(local267 - 2, local258 + -2, 4, 4, 16776960, local225);
 				}
 			}
 		}

client/src/main/java/rt4/Static101.java

@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static101 {
 
-	@OriginalMember(owner = "client!hm", name = "R", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;")
-	public static final JagString aClass100_537 = JagString.parse("<img=1>");
-
-	@OriginalMember(owner = "client!hm", name = "T", descriptor = "Lclient!na;")
 	public static final JagString aClass100_538 = JagString.parse(" ");
 
 	@OriginalMember(owner = "client!hm", name = "ab", descriptor = "I")

client/src/main/java/rt4/Static102.java

@@ -1,44 +1,10 @@
 package rt4;
 
-import java.util.Calendar;
-
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static102 {
 
-	@OriginalMember(owner = "client!hn", name = "K", descriptor = "Ljava/util/Calendar;")
+	@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
-	public static final Calendar aCalendar2 = Calendar.getInstance();
-
-    @OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
 	public static int anInt2680 = 0;
 
-	@OriginalMember(owner = "client!hn", name = "d", descriptor = "(I)Lclient!mm;")
-	public static SoftwareSprite method2071() {
-		@Pc(13) int local13 = SpriteLoader.innerHeights[0] * SpriteLoader.innerWidths[0];
-		@Pc(17) byte[] local17 = SpriteLoader.pixels[0];
-		@Pc(78) SoftwareSprite local78;
-		if (SpriteLoader.hasAlpha[0]) {
-			@Pc(30) byte[] local30 = SpriteLoader.alpha[0];
-			@Pc(33) int[] local33 = new int[local13];
-			for (@Pc(35) int local35 = 0; local35 < local13; local35++) {
-				local33[local35] = (local30[local35] & 0xFF) << 24 | SpriteLoader.palette[local17[local35] & 0xFF];
-			}
-			local78 = new SoftwareAlphaSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local33);
-		} else {
-			@Pc(83) int[] local83 = new int[local13];
-			for (@Pc(85) int local85 = 0; local85 < local13; local85++) {
-				local83[local85] = SpriteLoader.palette[local17[local85] & 0xFF];
-			}
-			local78 = new SoftwareSprite(SpriteLoader.width, SpriteLoader.height, SpriteLoader.xOffsets[0], SpriteLoader.yOffsets[0], SpriteLoader.innerWidths[0], SpriteLoader.innerHeights[0], local83);
-		}
-		SpriteLoader.clear();
-		return local78;
-	}
-
-	@OriginalMember(owner = "client!hn", name = "f", descriptor = "(B)V")
-	public static void method2073() {
-		Inv.objectContainerCache = new HashTable(32);
-	}
-
 }

client/src/main/java/rt4/Static104.java

@@ -6,199 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static104 {
 
-	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
+    @OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
-	public static void method2247(@OriginalArg(1) PathingEntity arg0) {
-		@Pc(9) BasType local9 = arg0.getBasType();
-		arg0.movementSeqId = local9.idleAnimationId;
-		if (arg0.movementQueueSize == 0) {
-			arg0.anInt3417 = 0;
-			return;
-		}
-		if (arg0.seqId != -1 && arg0.anInt3420 == 0) {
-			@Pc(40) SeqType local40 = SeqTypeList.get(arg0.seqId);
-			if (arg0.anInt3405 > 0 && local40.anInt5363 == 0) {
-				arg0.anInt3417++;
-				return;
-			}
-			if (arg0.anInt3405 <= 0 && local40.anInt5349 == 0) {
-				arg0.anInt3417++;
-				return;
-			}
-		}
-		@Pc(79) int local79 = arg0.xFine;
-		@Pc(82) int local82 = arg0.zFine;
-		@Pc(99) int local99 = arg0.movementQueueX[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
-		@Pc(116) int local116 = arg0.movementQueueZ[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
-		if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) {
-			arg0.xFine = local99;
-			arg0.zFine = local116;
-			return;
-		}
-		if (local99 <= local79) {
-			if (local79 <= local99) {
-				if (local116 > local82) {
-					arg0.anInt3400 = 1024;
-				} else if (local82 > local116) {
-					arg0.anInt3400 = 0;
-				}
-			} else if (local116 > local82) {
-				arg0.anInt3400 = 768;
-			} else if (local116 < local82) {
-				arg0.anInt3400 = 256;
-			} else {
-				arg0.anInt3400 = 512;
-			}
-		} else if (local116 > local82) {
-			arg0.anInt3400 = 1280;
-		} else if (local82 > local116) {
-			arg0.anInt3400 = 1792;
-		} else {
-			arg0.anInt3400 = 1536;
-		}
-		@Pc(224) int local224 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
-		@Pc(227) int local227 = local9.turnAnimation1;
-		if (local224 > 1024) {
-			local224 -= 2048;
-		}
-		@Pc(233) boolean local233 = true;
-		@Pc(235) byte local235 = 1;
-		if (local224 >= -256 && local224 <= 256) {
-			local227 = local9.walkAnimation;
-		} else if (local224 >= 256 && local224 < 768) {
-			local227 = local9.turnAnimation3;
-		} else if (local224 >= -768 && local224 <= -256) {
-			local227 = local9.turnAnimation2;
-		}
-		@Pc(273) int local273 = 4;
-		if (local227 == -1) {
-			local227 = local9.walkAnimation;
-		}
-		arg0.movementSeqId = local227;
-		if (arg0 instanceof Npc) {
-			local233 = ((Npc) arg0).type.aBoolean181;
-		}
-		if (local233) {
-			if (arg0.anInt3381 != arg0.anInt3400 && arg0.faceEntity == -1 && arg0.anInt3376 != 0) {
-				local273 = 2;
-			}
-			if (arg0.movementQueueSize > 2) {
-				local273 = 6;
-			}
-			if (arg0.movementQueueSize > 3) {
-				local273 = 8;
-			}
-			if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
-				local273 = 8;
-				arg0.anInt3417--;
-			}
-		} else {
-			if (arg0.movementQueueSize > 1) {
-				local273 = 6;
-			}
-			if (arg0.movementQueueSize > 2) {
-				local273 = 8;
-			}
-			if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
-				arg0.anInt3417--;
-				local273 = 8;
-			}
-		}
-		if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 2) {
-			local273 <<= 0x1;
-			local235 = 2;
-		} else if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 0) {
-			local235 = 0;
-			local273 >>= 0x1;
-		}
-		if (local273 < 8 || local9.runAnimationId == -1) {
-			if (local9.anInt1062 != -1 && local235 == 0) {
-				if (local9.turnAnimation1 == arg0.movementSeqId && local9.anInt1042 != -1) {
-					arg0.movementSeqId = local9.anInt1042;
-				} else if (local9.turnAnimation2 == arg0.movementSeqId && local9.anInt1066 != -1) {
-					arg0.movementSeqId = local9.anInt1066;
-				} else if (local9.turnAnimation3 == arg0.movementSeqId && local9.anInt1048 != -1) {
-					arg0.movementSeqId = local9.anInt1048;
-				} else {
-					arg0.movementSeqId = local9.anInt1062;
-				}
-			}
-		} else if (local9.turnAnimation1 == arg0.movementSeqId && local9.runAnimationId2 != -1) {
-			arg0.movementSeqId = local9.runAnimationId2;
-		} else if (arg0.movementSeqId == local9.turnAnimation2 && local9.runAnimationId3 != -1) {
-			arg0.movementSeqId = local9.runAnimationId3;
-		} else if (arg0.movementSeqId == local9.turnAnimation3 && local9.runAnimationId4 != -1) {
-			arg0.movementSeqId = local9.runAnimationId4;
-		} else {
-			arg0.movementSeqId = local9.runAnimationId;
-		}
-		if (local9.anInt1032 != -1) {
-			local273 <<= 0x7;
-			if (arg0.movementQueueSize == 1) {
-				@Pc(594) int local594 = (local99 >= arg0.xFine ? local99 - arg0.xFine : -local99 + arg0.xFine) << 7;
-				@Pc(600) int local600 = arg0.anInt3358 * arg0.anInt3358;
-				@Pc(622) int local622 = (local116 < arg0.zFine ? arg0.zFine - local116 : -arg0.zFine + local116) << 7;
-				@Pc(629) int local629 = local594 > local622 ? local594 : local622;
-				@Pc(636) int local636 = local9.anInt1032 * 2 * local629;
-				if (local636 < local600) {
-					arg0.anInt3358 /= 2;
-				} else if (local629 < local600 / 2) {
-					arg0.anInt3358 -= local9.anInt1032;
-					if (arg0.anInt3358 < 0) {
-						arg0.anInt3358 = 0;
-					}
-				} else if (arg0.anInt3358 < local273) {
-					arg0.anInt3358 += local9.anInt1032;
-					if (arg0.anInt3358 > local273) {
-						arg0.anInt3358 = local273;
-					}
-				}
-			} else if (local273 > arg0.anInt3358) {
-				arg0.anInt3358 += local9.anInt1032;
-				if (local273 < arg0.anInt3358) {
-					arg0.anInt3358 = local273;
-				}
-			} else if (arg0.anInt3358 > 0) {
-				arg0.anInt3358 -= local9.anInt1032;
-				if (arg0.anInt3358 < 0) {
-					arg0.anInt3358 = 0;
-				}
-			}
-			local273 = arg0.anInt3358 >> 7;
-			if (local273 < 1) {
-				local273 = 1;
-			}
-		}
-		if (local79 < local99) {
-			arg0.xFine += local273;
-			if (local99 < arg0.xFine) {
-				arg0.xFine = local99;
-			}
-		} else if (local79 > local99) {
-			arg0.xFine -= local273;
-			if (local99 > arg0.xFine) {
-				arg0.xFine = local99;
-			}
-		}
-		if (local82 < local116) {
-			arg0.zFine += local273;
-			if (arg0.zFine > local116) {
-				arg0.zFine = local116;
-			}
-		} else if (local116 < local82) {
-			arg0.zFine -= local273;
-			if (local116 > arg0.zFine) {
-				arg0.zFine = local116;
-			}
-		}
-		if (arg0.xFine == local99 && local116 == arg0.zFine) {
-			arg0.movementQueueSize--;
-			if (arg0.anInt3405 > 0) {
-				arg0.anInt3405--;
-			}
-		}
-	}
-
-	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IB)I")
 	public static int method2251(@OriginalArg(0) int arg0) {
 		@Pc(11) int local11 = arg0 & 0x3F;
 		@Pc(17) int local17 = arg0 >> 6 & 0x3;

client/src/main/java/rt4/Static107.java

@@ -13,7 +13,4 @@ public final class Static107 {
 	@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
 	public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
 
-	@OriginalMember(owner = "client!id", name = "e", descriptor = "[I")
-	public static final int[] anIntArray259 = new int[14];
-
 }

client/src/main/java/rt4/Static109.java

@@ -1,7 +1,6 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static109 {
 
@@ -17,15 +16,4 @@ public final class Static109 {
 	@OriginalMember(owner = "client!ig", name = "i", descriptor = "I")
 	public static int anInt2886;
 
-	@OriginalMember(owner = "client!ig", name = "a", descriptor = "(I)V")
-	public static void method2274() {
-		for (@Pc(7) int local7 = 0; local7 < NpcList.size; local7++) {
-			@Pc(18) int local18 = NpcList.ids[local7];
-			@Pc(22) Npc local22 = NpcList.npcs[local18];
-			if (local22 != null) {
-				Static263.method4514(local22.type.size, local22);
-			}
-		}
-	}
-
 }

client/src/main/java/rt4/Static110.java

@@ -10,8 +10,4 @@ public final class Static110 {
 		Static182.aClass3_Sub14ArrayArray2[arg0] = arg1;
 	}
 
-	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZII)Lclient!na;")
-	public static JagString method2285(@OriginalArg(2) int arg0) {
-		return JagString.parseInt(true, arg0);
-	}
 }

client/src/main/java/rt4/Static112.java

@@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static112 {
 
-	@OriginalMember(owner = "client!ij", name = "a", descriptor = "Lclient!na;")
-	public static final JagString DUELFRIEND = JagString.parse(":duelfriend:");
-
 	@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
 	public static void method2297() {
 		@Pc(3) int local3 = Static183.anInt4271;
@@ -31,9 +28,9 @@ public final class Static112 {
 					}
 				}
 			} else if (GlRenderer.enabled) {
-				GlRaster.method1182(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
+				GlRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
 			} else {
-				SoftwareRaster.method2484(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
+				SoftwareRaster.fillRectAlpha(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910);
 			}
 		}
 		@Pc(112) int local112;
@@ -44,13 +41,13 @@ public final class Static112 {
 				Static39.aClass3_Sub2_Sub1_1.renderTransparent(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9);
 			}
 			Static181.aClass3_Sub2_Sub1_9.renderTransparent(local3, local9);
-			Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9);
+			Static181.aClass3_Sub2_Sub1_9.renderHorizontalFlipTransparent(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9);
 		}
-		Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
+		Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
 		if (GlRenderer.enabled) {
-			GlRaster.method1182(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
+			GlRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
 		} else {
-			SoftwareRaster.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
+			SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910);
 		}
 		local114 = Mouse.anInt5032;
 		local112 = Mouse.anInt4873;
@@ -60,9 +57,9 @@ public final class Static112 {
 			local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
 			if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) {
 				if (GlRenderer.enabled) {
-					GlRaster.method1182(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
+					GlRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
 				} else {
-					SoftwareRaster.method2484(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
+					SoftwareRaster.fillRectAlpha(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208);
 				}
 			}
 		}
@@ -97,10 +94,10 @@ public final class Static112 {
 			local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height;
 			for (local418 = 0; local418 < local219; local418++) {
 				Static92.aClass3_Sub2_Sub1_6.renderTransparent(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20);
-				Static92.aClass3_Sub2_Sub1_6.method1421(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height);
+				Static92.aClass3_Sub2_Sub1_6.renderHorizontalFlipTransparent(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height);
 			}
 			Static204.aClass3_Sub2_Sub1_10.renderTransparent(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
-			Static204.aClass3_Sub2_Sub1_10.method1421(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);
+			Static204.aClass3_Sub2_Sub1_10.renderHorizontalFlipTransparent(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);
 		}
 		for (local203 = 0; local203 < MiniMenu.size; local203++) {
 			local219 = (MiniMenu.size - local203 - 1) * 15 + local9 + 35;
@@ -108,7 +105,7 @@ public final class Static112 {
 			if (local3 < local112 && local13 + local3 > local112 && local219 - 13 < local114 && local114 < local219 + 3) {
 				local418 = Static262.anInt5752;
 			}
-			Fonts.b12Full.method2857(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
+			Fonts.b12Full.renderLeft(MiniMenu.getOp(local203), local3 + 3, local219, local418, 0);
 		}
 		Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
 	}

client/src/main/java/rt4/Static114.java

@@ -13,22 +13,6 @@ public final class Static114 {
     @OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
 	public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 };
 
-	@OriginalMember(owner = "client!j", name = "c", descriptor = "(I)V")
-	public static void method4625() {
-		Static204.aClass69_113 = new LinkedList();
-	}
-
-	@OriginalMember(owner = "client!j", name = "a", descriptor = "([BI)Lclient!dd;")
-	public static SoftwareFont method4635(@OriginalArg(0) byte[] arg0) {
-		if (arg0 == null) {
-			return null;
-		} else {
-			@Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
-			SpriteLoader.clear();
-			return local22;
-		}
-	}
-
 	@OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V")
 	public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
 		@Pc(24) int local24 = Fonts.p12Full.method2856(arg1, 250);

client/src/main/java/rt4/Static116.java

@@ -1,18 +1,10 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static116 {
 
 	@OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
 	public static int anInt2952 = 0;
 
-    @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;")
-	public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
-		@Pc(9) byte[] local9 = arg0.method4500(arg1);
-		return local9 == null ? null : new MidiInstrument(local9);
-	}
-
 }

client/src/main/java/rt4/Static118.java

@@ -9,12 +9,6 @@ public final class Static118 {
     @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
 	public static Component aClass13_15;
 
-    @OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I")
-	public static int method2352() {
-		Static232.anInt5212 = 0;
-		return Static119.method2385();
-	}
-
 	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")
 	public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
 		for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {

client/src/main/java/rt4/Static119.java

@@ -7,18 +7,4 @@ public final class Static119 {
 	@OriginalMember(owner = "client!je", name = "eb", descriptor = "[I")
 	public static int[] anIntArray282;
 
-	@OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
-	public static int method2385() {
-		if (WorldMap.labels == null) {
-			return -1;
-		}
-		while (Static232.anInt5212 < WorldMap.labels.anInt5074) {
-			if (WorldMap.labels.method3897(Static232.anInt5212)) {
-				return Static232.anInt5212++;
-			}
-			Static232.anInt5212++;
-		}
-		return -1;
-	}
-
 }

client/src/main/java/rt4/Static122.java

@@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static122 {
 
-	@OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;")
+	@OriginalMember(owner = "client!jh", name = "a", descriptor = "(Lclient!ve;ZIIZI)V")
-	public static final JagString aClass100_591 = JagString.parse("(Udns");
-
-    @OriginalMember(owner = "client!jh", name = "a", descriptor = "(Lclient!ve;ZIIZI)V")
 	public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) {
 		Static172.aClass153_70 = arg0;
 		MidiPlayer.anInt441 = 1;
@@ -19,8 +16,4 @@ public final class Static122 {
 		MidiPlayer.anInt1757 = 10000;
 	}
 
-    @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
-	public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2) {
-		return SpriteLoader.decode(arg2, 0, arg0) ? Static114.method4635(arg1.getFile(arg0, 0)) : null;
-	}
 }

client/src/main/java/rt4/Static125.java

@@ -2,7 +2,6 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static125 {
 
@@ -23,104 +22,4 @@ public final class Static125 {
 		CreateManager.reply = -3;
 	}
 
-	@OriginalMember(owner = "client!jl", name = "c", descriptor = "(I)V")
-	public static void updateLockedCamera() {
-		@Pc(9) int local9 = Static248.anInt4232 * 128 + 64;
-		@Pc(15) int local15 = Static245.anInt5375 * 128 + 64;
-		@Pc(23) int local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static231.anInt5203;
-		if (Static113.anInt4612 >= 100) {
-			Static138.renderX = Static245.anInt5375 * 128 + 64;
-			Static134.renderZ = Static248.anInt4232 * 128 + 64;
-			Static5.anInt40 = SceneGraph.getTileHeight(Player.level, Static138.renderX, Static134.renderZ) - Static231.anInt5203;
-		} else {
-			if (Static138.renderX < local15) {
-				Static138.renderX += Static233.anInt5225 + Static113.anInt4612 * (local15 - Static138.renderX) / 1000;
-				if (Static138.renderX > local15) {
-					Static138.renderX = local15;
-				}
-			}
-			if (Static5.anInt40 < local23) {
-				Static5.anInt40 += (local23 - Static5.anInt40) * Static113.anInt4612 / 1000 + Static233.anInt5225;
-				if (Static5.anInt40 > local23) {
-					Static5.anInt40 = local23;
-				}
-			}
-			if (Static138.renderX > local15) {
-				Static138.renderX -= Static233.anInt5225 + (Static138.renderX - local15) * Static113.anInt4612 / 1000;
-				if (Static138.renderX < local15) {
-					Static138.renderX = local15;
-				}
-			}
-			if (Static134.renderZ < local9) {
-				Static134.renderZ += Static233.anInt5225 + Static113.anInt4612 * (local9 - Static134.renderZ) / 1000;
-				if (local9 < Static134.renderZ) {
-					Static134.renderZ = local9;
-				}
-			}
-			if (local23 < Static5.anInt40) {
-				Static5.anInt40 -= (Static5.anInt40 - local23) * Static113.anInt4612 / 1000 + Static233.anInt5225;
-				if (local23 > Static5.anInt40) {
-					Static5.anInt40 = local23;
-				}
-			}
-			if (Static134.renderZ > local9) {
-				Static134.renderZ -= Static233.anInt5225 + (Static134.renderZ - local9) * Static113.anInt4612 / 1000;
-				if (local9 > Static134.renderZ) {
-					Static134.renderZ = local9;
-				}
-			}
-		}
-		local9 = Static265.anInt5765 * 128 + 64;
-		local15 = Static251.anInt5449 * 128 + 64;
-		local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
-		@Pc(236) int local236 = local23 - Static5.anInt40;
-		@Pc(241) int local241 = local9 - Static134.renderZ;
-		@Pc(246) int local246 = local15 - Static138.renderX;
-		@Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241));
-		@Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF;
-		if (local268 < 128) {
-			local268 = 128;
-		}
-		if (local268 > 383) {
-			local268 = 383;
-		}
-		@Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
-		if (Static240.cameraPitch < local268) {
-			Static240.cameraPitch += Static133.anInt5230 + Static233.anInt5217 * (local268 - Static240.cameraPitch) / 1000;
-			if (Static240.cameraPitch > local268) {
-				Static240.cameraPitch = local268;
-			}
-		}
-		if (Static240.cameraPitch > local268) {
-			Static240.cameraPitch -= (Static240.cameraPitch - local268) * Static233.anInt5217 / 1000 + Static133.anInt5230;
-			if (Static240.cameraPitch < local268) {
-				Static240.cameraPitch = local268;
-			}
-		}
-		@Pc(350) int local350 = local292 - Static184.cameraYaw;
-		if (local350 > 1024) {
-			local350 -= 2048;
-		}
-		if (local350 < -1024) {
-			local350 += 2048;
-		}
-		if (local350 > 0) {
-			Static184.cameraYaw += local350 * Static233.anInt5217 / 1000 + Static133.anInt5230;
-			Static184.cameraYaw &= 0x7FF;
-		}
-		if (local350 < 0) {
-			Static184.cameraYaw -= Static233.anInt5217 * -local350 / 1000 + Static133.anInt5230;
-			Static184.cameraYaw &= 0x7FF;
-		}
-		@Pc(404) int local404 = local292 - Static184.cameraYaw;
-		if (local404 > 1024) {
-			local404 -= 2048;
-		}
-		if (local404 < -1024) {
-			local404 += 2048;
-		}
-		if (local404 < 0 && local350 > 0 || local404 > 0 && local350 < 0) {
-			Static184.cameraYaw = local292;
-		}
-	}
 }

client/src/main/java/rt4/Static127.java

@@ -1,6 +1,8 @@
 package rt4;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
@@ -9,6 +11,18 @@ public final class Static127 {
 
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_520 = JagString.parse("(U4");
+	@OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
+	public static final JagString aClass100_761 = JagString.parse("(U3");
+	@OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1097 = JagString.parse("(U2");
+	@OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;")
+	public static final JagString aClass100_133 = JagString.parse("(U1");
+	@OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1002 = JagString.parse("(U5");
+	@OriginalMember(owner = "client!jh", name = "g", descriptor = "Lclient!na;")
+	public static final JagString aClass100_591 = JagString.parse("(Udns");
+	@OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;")
+	public static final JagString PERCENT_SIGN = JagString.parse("(U");
 	@OriginalMember(owner = "client!k", name = "j", descriptor = "I")
 	public static int anInt3126;
 
@@ -121,9 +135,9 @@ public final class Static127 {
 				@Pc(382) int local382 = local367 + local81;
 				for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
 					if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
-						Static159.objStacks[local384][local358][local367] = Static159.objStacks[local384][local378][local382];
+						SceneGraph.objStacks[local384][local358][local367] = SceneGraph.objStacks[local384][local378][local382];
 					} else {
-						Static159.objStacks[local384][local358][local367] = null;
+						SceneGraph.objStacks[local384][local358][local367] = null;
 					}
 				}
 			}
@@ -160,38 +174,35 @@ public final class Static127 {
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
 	public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
-		if (arg1.indexOf(Static49.PERCENT_SIGN) == -1) {
+		if (arg1.indexOf(PERCENT_SIGN) == -1) {
 			return arg1;
 		}
 		while (true) {
-			@Pc(14) int local14 = arg1.indexOf(Static23.aClass100_133);
+			@Pc(14) int local14 = arg1.indexOf(aClass100_133);
 			if (local14 == -1) {
 				while (true) {
-					local14 = arg1.indexOf(Static276.aClass100_1097);
+					local14 = arg1.indexOf(aClass100_1097);
 					if (local14 == -1) {
 						while (true) {
-							local14 = arg1.indexOf(Static160.aClass100_761);
+							local14 = arg1.indexOf(aClass100_761);
 							if (local14 == -1) {
 								while (true) {
 									local14 = arg1.indexOf(aClass100_520);
 									if (local14 == -1) {
 										while (true) {
-											local14 = arg1.indexOf(Static235.aClass100_1002);
+											local14 = arg1.indexOf(aClass100_1002);
 											if (local14 == -1) {
 												while (true) {
-													local14 = arg1.indexOf(Static122.aClass100_591);
+													local14 = arg1.indexOf(aClass100_591);
 													if (local14 == -1) {
 														return arg1;
 													}
 													@Pc(246) JagString local246 = JagString.EMPTY;
 													if (Player.lastLogAddress != null) {
 														local246 = Static181.method3341(Player.lastLogAddress.intArg2);
-														try {
+														if (Player.lastLogAddress.result != null) {
-															if (Player.lastLogAddress.result != null) {
+															@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes(StandardCharsets.ISO_8859_1);
-																@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
+															local246 = JagString.decodeString(local265, local265.length, 0);
-																local246 = JagString.decodeString(local265, local265.length, 0);
-															}
-														} catch (@Pc(274) UnsupportedEncodingException local274) {
 														}
 													}
 													arg1 = JagString.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });

client/src/main/java/rt4/Static131.java

@@ -10,10 +10,7 @@ public final class Static131 {
     @OriginalMember(owner = "client!kd", name = "ub", descriptor = "I")
 	public static int anInt3255;
 
-    @OriginalMember(owner = "client!kd", name = "mb", descriptor = "[Lclient!cl;")
+    @OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
-	public static final AnimFrameset[] aClass3_Sub2_Sub7Array5 = new AnimFrameset[14];
-
-	@OriginalMember(owner = "client!kd", name = "ob", descriptor = "I")
 	public static int anInt3251 = 0;
 
     @OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")

client/src/main/java/rt4/Static136.java

@@ -10,11 +10,8 @@ public final class Static136 {
     @OriginalMember(owner = "client!kk", name = "j", descriptor = "I")
 	public static int anInt3325 = 0;
 
-	@OriginalMember(owner = "client!kk", name = "m", descriptor = "Lclient!na;")
-	public static final JagString CS_ERROR = JagString.parse("Clientscript error )2 check log for details");
-
 	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(I)Z")
 	public static boolean method2655() {
-		return MidiPlayer.anInt441 == 0 ? Static172.aClass3_Sub3_Sub4_2.method4414() : true;
+		return MidiPlayer.anInt441 != 0 || Static172.midiPcmStream.method4414();
 	}
 }

client/src/main/java/rt4/Static145.java

@@ -67,7 +67,7 @@ public final class Static145 {
 			SoftwareRaster.fillRect(local11 + 1, local3 + 1, local9 - 2, 16, 0);
 			SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0);
 		}
-		Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1);
+		Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1);
 		@Pc(96) int local96 = Mouse.anInt5032;
 		@Pc(98) int local98 = Mouse.anInt4873;
 		for (@Pc(107) int local107 = 0; local107 < MiniMenu.size; local107++) {
@@ -76,7 +76,7 @@ public final class Static145 {
 			if (local11 < local98 && local98 < local11 + local9 && local127 - 13 < local96 && local96 < local127 + 3) {
 				local129 = 16776960;
 			}
-			Fonts.b12Full.method2857(MiniMenu.getOp(local107), local11 + 3, local127, local129, 0);
+			Fonts.b12Full.renderLeft(MiniMenu.getOp(local107), local11 + 3, local127, local129, 0);
 		}
 		Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
 	}

client/src/main/java/rt4/Static146.java

@@ -12,10 +12,7 @@ public final class Static146 {
 	@OriginalMember(owner = "client!lg", name = "b", descriptor = "Z")
 	public static boolean aBoolean174 = false;
 
-	@OriginalMember(owner = "client!lg", name = "c", descriptor = "[Lclient!tk;")
+    @OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
-	public static final SeqType[] aClass144Array1 = new SeqType[14];
-
-	@OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
 	public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) {
 		@Pc(6) int local6 = arg0.offset;
 		@Pc(14) byte[] local14 = arg1.method3148();

client/src/main/java/rt4/Static159.java

@@ -9,10 +9,7 @@ public final class Static159 {
 	@OriginalMember(owner = "client!mi", name = "Z", descriptor = "I")
 	public static int anInt3893;
 
-    @OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;")
+	@OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V")
-	public static final LinkedList[][][] objStacks = new LinkedList[4][104][104];
-
-    @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V")
 	public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
 		for (@Pc(3) int local3 = 0; local3 < arg3.length; local3++) {
 			@Pc(15) int local15 = arg3[local3];

client/src/main/java/rt4/Static160.java

@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static160 {
 
-	@OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
-	public static final JagString aClass100_761 = JagString.parse("(U3");
-
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V")
 	public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
 		if (GlRenderer.enabled) {

client/src/main/java/rt4/Static164.java

@@ -227,7 +227,7 @@ public final class Static164 {
 			local133 = local71;
 		}
 		if (arg3 && (local5.stackable == 1 || arg5 != 1) && arg5 != -1) {
-			ObjTypeList.aClass3_Sub2_Sub9_Sub1_1.method2857(Static52.method1288(arg5), 0, 9, 16776960, 1);
+			ObjTypeList.aClass3_Sub2_Sub9_Sub1_1.renderLeft(Static52.method1288(arg5), 0, 9, 16776960, 1);
 		}
 		SoftwareRaster.method2491(local118, local120, local122);
 		SoftwareRaster.method2488(local125);

client/src/main/java/rt4/Static172.java

@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static172 {
 
     @OriginalMember(owner = "client!nj", name = "e", descriptor = "Lclient!va;")
-	public static MidiPcmStream aClass3_Sub3_Sub4_2;
+	public static MidiPcmStream midiPcmStream;
 
     @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_70;

client/src/main/java/rt4/Static18.java

@@ -12,28 +12,6 @@ public final class Static18 {
     @OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;")
 	public static final JagString COMPLETE_PERCENT = JagString.parse("<br>(X100(U(Y");
 
-	@OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V")
-	public static void method553(@OriginalArg(0) PathingEntity arg0) {
-		@Pc(8) int local8 = arg0.anInt3395 - client.loop;
-		@Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
-		@Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
-		if (arg0.anInt3431 == 0) {
-			arg0.anInt3400 = 1024;
-		}
-		arg0.xFine += (local20 - arg0.xFine) / local8;
-		arg0.zFine += (local36 - arg0.zFine) / local8;
-		if (arg0.anInt3431 == 1) {
-			arg0.anInt3400 = 1536;
-		}
-		arg0.anInt3417 = 0;
-		if (arg0.anInt3431 == 2) {
-			arg0.anInt3400 = 0;
-		}
-		if (arg0.anInt3431 == 3) {
-			arg0.anInt3400 = 512;
-		}
-	}
-
 	@OriginalMember(owner = "client!bh", name = "a", descriptor = "(IB)I")
 	public static int method554(@OriginalArg(0) int arg0) {
 		return arg0 >>> 8;

client/src/main/java/rt4/Static204.java

@@ -9,9 +9,6 @@ public final class Static204 {
 	@OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;")
 	public static Sprite aClass3_Sub2_Sub1_10;
 
-	@OriginalMember(owner = "client!qi", name = "u", descriptor = "Lclient!ih;")
-	public static LinkedList aClass69_113 = new LinkedList();
-
 	@OriginalMember(owner = "client!qi", name = "B", descriptor = "Lclient!na;")
 	public static final JagString aClass100_896 = JagString.parse("<col=ffffff>");
 

client/src/main/java/rt4/Static211.java

@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static211 {
 
@@ -23,12 +21,6 @@ public final class Static211 {
 	@OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
 	public static boolean aBoolean73 = false;
 
-	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;")
-	public static JagString method923(@OriginalArg(0) JagString arg0) {
-		@Pc(12) int local12 = Static171.method3218(arg0);
-		return local12 == -1 ? aClass100_517 : WorldMap.labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872);
-	}
-
     @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
 	public static void method930() {
 		if (client.musicChannel != null) {

client/src/main/java/rt4/Static214.java

@@ -9,9 +9,6 @@ public final class Static214 {
 	@OriginalMember(owner = "client!rg", name = "s", descriptor = "I")
 	public static int anInt5574 = -1;
 
-	@OriginalMember(owner = "client!rg", name = "A", descriptor = "[I")
-	public static final int[] anIntArray492 = new int[14];
-
 	@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
 	public static void method4359(@OriginalArg(0) Player arg0) {
 		@Pc(12) AreaSound local12 = (AreaSound) AreaSoundManager.playerSounds.get(arg0.username.encode37());
@@ -36,11 +33,6 @@ public final class Static214 {
 		}
 	}
 
-	@OriginalMember(owner = "client!rg", name = "d", descriptor = "(B)Lclient!bn;")
-	public static Map method4361() {
-		return WorldMap.currentMap;
-	}
-
 	@OriginalMember(owner = "client!rg", name = "a", descriptor = "(IIIIIIIII)V")
 	public static void method4364(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
 		@Pc(7) int local7 = arg2 - arg7;

client/src/main/java/rt4/Static220.java

@@ -14,7 +14,7 @@ public final class Static220 {
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V")
 	public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(9) LinkedList local9 = Static159.objStacks[Player.level][arg1][arg0];
+		@Pc(9) LinkedList local9 = SceneGraph.objStacks[Player.level][arg1][arg0];
 		if (local9 == null) {
 			Static187.method3420(Player.level, arg1, arg0);
 			return;

client/src/main/java/rt4/Static23.java

@@ -9,10 +9,7 @@ public final class Static23 {
 	@OriginalMember(owner = "client!bm", name = "a", descriptor = "F")
 	public static float aFloat5;
 
-	@OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
-	public static final JagString aClass100_133 = JagString.parse("(U1");
-
-	@OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
 	public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(3) int local3;
 		@Pc(10) int local10;

client/src/main/java/rt4/Static230.java

@@ -1,6 +1,8 @@
 package rt4;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
@@ -76,12 +78,7 @@ public final class Static230 {
 
 	@OriginalMember(owner = "client!sj", name = "a", descriptor = "(Ljava/lang/String;I)Lclient!na;")
 	public static JagString method3952(@OriginalArg(0) String arg0) {
-		@Pc(14) byte[] local14;
+		@Pc(14) byte[] local14 = arg0.getBytes(StandardCharsets.ISO_8859_1);
-		try {
-			local14 = arg0.getBytes("ISO-8859-1");
-		} catch (@Pc(16) UnsupportedEncodingException local16) {
-			local14 = arg0.getBytes();
-		}
 		@Pc(23) JagString local23 = new JagString();
 		local23.chars = local14;
 		local23.length = 0;
@@ -116,7 +113,7 @@ public final class Static230 {
 	@OriginalMember(owner = "client!sj", name = "c", descriptor = "(II)V")
 	public static void method3956(@OriginalArg(0) int arg0) {
 		if (MidiPlayer.anInt441 == 0) {
-			Static172.aClass3_Sub3_Sub4_2.method4447(arg0);
+			Static172.midiPcmStream.method4447(arg0);
 		} else {
 			MidiPlayer.anInt5527 = arg0;
 		}

client/src/main/java/rt4/Static232.java

@@ -12,9 +12,6 @@ public final class Static232 {
 	@OriginalMember(owner = "client!sm", name = "e", descriptor = "[[[B")
 	public static byte[][][] aByteArrayArrayArray13;
 
-	@OriginalMember(owner = "client!sm", name = "m", descriptor = "I")
-	public static int anInt5212;
-
     @OriginalMember(owner = "client!sm", name = "a", descriptor = "(IIIIIIIIIII)V")
 	public static void method3991(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(8) int arg5, @OriginalArg(9) int arg6, @OriginalArg(10) int arg7) {
 		@Pc(9) int local9 = arg2 - arg4;

client/src/main/java/rt4/Static235.java

@@ -7,10 +7,7 @@ public final class Static235 {
 	@OriginalMember(owner = "client!tb", name = "X", descriptor = "Lclient!se;")
 	public static MapElementList mapElementList;
 
-	@OriginalMember(owner = "client!tb", name = "P", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!tb", name = "Q", descriptor = "I")
-	public static final JagString aClass100_1002 = JagString.parse("(U5");
-
-	@OriginalMember(owner = "client!tb", name = "Q", descriptor = "I")
 	public static int anInt5276 = 0;
 
 	@OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I")

client/src/main/java/rt4/Static241.java

@@ -123,7 +123,7 @@ public final class Static241 {
 
 	@OriginalMember(owner = "client!th", name = "a", descriptor = "(Z)V")
 	public static void method4548() {
-		Static172.aClass3_Sub3_Sub4_2.method4446();
+		Static172.midiPcmStream.method4446();
 		MidiPlayer.anInt441 = 1;
 		Static172.aClass153_70 = null;
 	}

client/src/main/java/rt4/Static253.java

@@ -160,13 +160,6 @@ public final class Static253 {
 		}
 	}
 
-	@OriginalMember(owner = "client!ui", name = "d", descriptor = "(II)V")
-	public static void method4332(@OriginalArg(0) int arg0) {
-		if (arg0 >= 0 && MapList.aBooleanArray130.length > arg0) {
-			MapList.aBooleanArray130[arg0] = !MapList.aBooleanArray130[arg0];
-		}
-	}
-
     @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
     public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
         Static277.anInt5854 = 0;
@@ -431,7 +424,7 @@ public final class Static253 {
                     } else {
                         SoftwareRaster.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
                     }
-                    Fonts.b12Full.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0);
+                    Fonts.b12Full.renderLeft(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0);
                     if (GlRenderer.enabled) {
                         GlRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0);
                     } else {

client/src/main/java/rt4/Static258.java

@@ -10,10 +10,4 @@ public final class Static258 {
 		return arg0 >= 97 && arg0 <= 122 || arg0 >= 65 && arg0 <= 90;
 	}
 
-	@OriginalMember(owner = "client!va", name = "c", descriptor = "(BI)V")
-	public static void method4444(@OriginalArg(1) int arg0) {
-		Static9.anInt172 = arg0;
-		Static91.anInt2428 = 20;
-		Static201.anInt1864 = 3;
-	}
 }

client/src/main/java/rt4/Static26.java

@@ -12,53 +12,7 @@ public final class Static26 {
 	@OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;")
 	public static final JagString aClass100_160 = Static165.method3165();
 
-    @OriginalMember(owner = "client!ca", name = "h", descriptor = "(I)V")
+    @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
-	public static void setupLoadingScreenRegion() {
-		@Pc(10) int local10 = (Static138.renderX >> 10) + (Static225.originX >> 3);
-		@Pc(23) int local23 = (Static134.renderZ >> 10) + (Static142.originZ >> 3);
-		Static156.locationMapFilesBuffer = new byte[18][];
-		Static35.underWaterLocationsMapFileIds = new int[18];
-		Static191.npcSpawnsFilesBuffer = new byte[18][];
-		Static36.mapFileIds = new int[18];
-		Static72.regionsXteaKeys = new int[18][4];
-		Static186.underWaterMapFilesBuffer = new byte[18][];
-		Static238.regionBitPacked = new int[18];
-		Static273.mapFilesBuffer = new byte[18][];
-		Static175.npcSpawnsFileIds = new int[18];
-		Static99.underWaterMapFileIds = new int[18];
-		Static172.locationsMapFileIds = new int[18];
-		Static19.underWaterLocationsMapFilesBuffer = new byte[18][];
-		@Pc(74) int local74 = 0;
-		@Pc(80) int local80;
-		for (local80 = (local10 - 6) / 8; local80 <= (local10 + 6) / 8; local80++) {
-			for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
-				@Pc(115) int local115 = (local80 << 8) + local97;
-				Static238.regionBitPacked[local74] = local115;
-				Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
-				if (Static175.npcSpawnsFileIds[local74] == -1) {
-					Static36.mapFileIds[local74] = -1;
-					Static172.locationsMapFileIds[local74] = -1;
-					Static99.underWaterMapFileIds[local74] = -1;
-					Static35.underWaterLocationsMapFileIds[local74] = -1;
-				}
-				local74++;
-			}
-		}
-		for (local80 = local74; local80 < Static175.npcSpawnsFileIds.length; local80++) {
-			Static175.npcSpawnsFileIds[local80] = -1;
-			Static36.mapFileIds[local80] = -1;
-			Static172.locationsMapFileIds[local80] = -1;
-			Static99.underWaterMapFileIds[local80] = -1;
-			Static35.underWaterLocationsMapFileIds[local80] = -1;
-		}
-		Static127.method2463(0, local23, local10, 8, true, 8);
-	}
-
-	@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
 	public static void method743(@OriginalArg(0) boolean arg0) {
 		@Pc(13) int local13 = Static273.mapFilesBuffer.length;
 		@Pc(19) byte[][] local19;

client/src/main/java/rt4/Static263.java

@@ -32,34 +32,4 @@ public final class Static263 {
 		}
 	}
 
-	@OriginalMember(owner = "client!vg", name = "a", descriptor = "(IILclient!fe;)V")
-	public static void method4514(@OriginalArg(0) int arg0, @OriginalArg(2) PathingEntity arg1) {
-		if (client.loop < arg1.anInt3395) {
-			Static18.method553(arg1);
-		} else if (arg1.anInt3386 >= client.loop) {
-			Static280.method4665(arg1);
-		} else {
-			Static104.method2247(arg1);
-		}
-		if (arg1.xFine < 128 || arg1.zFine < 128 || arg1.xFine >= 13184 || arg1.zFine >= 13184) {
-			arg1.seqId = -1;
-			arg1.spotAnimId = -1;
-			arg1.anInt3395 = 0;
-			arg1.anInt3386 = 0;
-			arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
-			arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64;
-			arg1.method2689();
-		}
-		if (arg1 == PlayerList.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) {
-			arg1.spotAnimId = -1;
-			arg1.anInt3395 = 0;
-			arg1.anInt3386 = 0;
-			arg1.seqId = -1;
-			arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
-			arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64;
-			arg1.method2689();
-		}
-		Static37.method949(arg1);
-		Static34.method879(arg1);
-	}
 }

client/src/main/java/rt4/Static269.java

@@ -244,14 +244,14 @@ public final class Static269 {
 			Fonts.b12Full.renderCenter(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1);
 			return;
 		}
-		Static37.anInt1176 = (int) ((float) (arg2 * 2) / WorldMap.zoom);
+		WorldMap.anInt1176 = (int) ((float) (arg2 * 2) / WorldMap.zoom);
 		Static109.anInt2882 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom);
 		@Pc(211) int local211 = WorldMap.anInt435 - (int) ((float) arg3 / WorldMap.zoom);
 		local50 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom);
 		Static109.anInt2884 = WorldMap.anInt919 - (int) ((float) arg2 / WorldMap.zoom);
 		@Pc(236) int local236 = WorldMap.anInt919 + (int) ((float) arg2 / WorldMap.zoom);
 		local61 = (int) ((float) arg3 / WorldMap.zoom) + WorldMap.anInt435;
-		Static89.anInt2387 = (int) ((float) (arg3 * 2) / WorldMap.zoom);
+		WorldMap.anInt2387 = (int) ((float) (arg3 * 2) / WorldMap.zoom);
 		if (GlRenderer.enabled) {
 			if (WorldMap.aClass3_Sub2_Sub1_Sub1_2 == null || WorldMap.aClass3_Sub2_Sub1_Sub1_2.width != arg3 || WorldMap.aClass3_Sub2_Sub1_Sub1_2.height != arg2) {
 				WorldMap.aClass3_Sub2_Sub1_Sub1_2 = null;

client/src/main/java/rt4/Static276.java

@@ -12,10 +12,7 @@ public final class Static276 {
 	@OriginalMember(owner = "client!wh", name = "m", descriptor = "[I")
 	public static final int[] cameraAmplitude = new int[5];
 
-    @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
-	public static final JagString aClass100_1097 = JagString.parse("(U2");
-
-	@OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
 	public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (Static9.method187(arg0, arg1, arg2)) {
 			@Pc(10) int local10 = arg1 << 7;

client/src/main/java/rt4/Static278.java

@@ -140,7 +140,7 @@ public final class Static278 {
 		for (local19 = 0; local19 < 4; local19++) {
 			for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
 				for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
-					Static159.objStacks[local19][local115][local122] = null;
+					SceneGraph.objStacks[local19][local115][local122] = null;
 				}
 			}
 		}

client/src/main/java/rt4/Static280.java

@@ -12,34 +12,6 @@ public final class Static280 {
 	@OriginalMember(owner = "client!wl", name = "u", descriptor = "I")
 	public static int anInt5895 = 0;
 
-	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(Lclient!fe;B)V")
-	public static void method4665(@OriginalArg(0) PathingEntity arg0) {
-		if (client.loop == arg0.anInt3386 || arg0.seqId == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > SeqTypeList.get(arg0.seqId).anIntArray474[arg0.anInt3425]) {
-			@Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395;
-			@Pc(41) int local41 = client.loop - arg0.anInt3395;
-			@Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
-			@Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
-			@Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.getSize() * 64;
-			@Pc(86) int local86 = arg0.anInt3392 * 128 + arg0.getSize() * 64;
-			arg0.xFine = (local41 * local75 + local52 * (local35 - local41)) / local35;
-			arg0.zFine = (local86 * local41 + local64 * (local35 - local41)) / local35;
-		}
-		arg0.anInt3417 = 0;
-		if (arg0.anInt3431 == 0) {
-			arg0.anInt3400 = 1024;
-		}
-		if (arg0.anInt3431 == 1) {
-			arg0.anInt3400 = 1536;
-		}
-		if (arg0.anInt3431 == 2) {
-			arg0.anInt3400 = 0;
-		}
-		if (arg0.anInt3431 == 3) {
-			arg0.anInt3400 = 512;
-		}
-		arg0.anInt3381 = arg0.anInt3400;
-	}
-
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "([IIIIIIIIIZB)V")
 	public static void method4667(@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) int arg8, @OriginalArg(9) boolean arg9) {
 		@Pc(7) int local7 = arg2;

client/src/main/java/rt4/Static3.java

@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
@@ -9,15 +8,7 @@ public final class Static3 {
 	@OriginalMember(owner = "client!ab", name = "b", descriptor = "I")
 	public static int anInt5868 = 0;
 
-	@OriginalMember(owner = "client!ab", name = "a", descriptor = "(Lclient!na;I)V")
+    @OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
-	public static void method4656(@OriginalArg(0) JagString arg0) {
-		@Pc(9) int local9 = Static171.method3218(arg0);
-		if (local9 != -1) {
-			Static80.method3616(WorldMap.labels.aShortArray73[local9], WorldMap.labels.aShortArray72[local9]);
-		}
-	}
-
-	@OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
 	public static Class114[] method4660() {
 		if (Static105.aClass114Array1 == null) {
 			@Pc(16) Class114[] local16 = Static197.method3558(GameShell.signLink);

client/src/main/java/rt4/Static34.java

@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static34 {
 
@@ -60,147 +58,4 @@ public final class Static34 {
     @OriginalMember(owner = "client!ck", name = "K", descriptor = "I")
 	public static int anInt1053 = 0;
 
-    @OriginalMember(owner = "client!ck", name = "a", descriptor = "(Lclient!fe;I)V")
-	public static void method879(@OriginalArg(0) PathingEntity arg0) {
-		arg0.aBoolean171 = false;
-		@Pc(18) SeqType local18;
-		if (arg0.movementSeqId != -1) {
-			local18 = SeqTypeList.get(arg0.movementSeqId);
-			if (local18 == null || local18.frames == null) {
-				arg0.movementSeqId = -1;
-			} else {
-				arg0.anInt3396++;
-				if (local18.frames.length > arg0.anInt3407 && arg0.anInt3396 > local18.anIntArray474[arg0.anInt3407]) {
-					arg0.anInt3396 = 1;
-					arg0.anInt3407++;
-					arg0.anInt3388++;
-					SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, arg0 == PlayerList.self, arg0.anInt3407);
-				}
-				if (arg0.anInt3407 >= local18.frames.length) {
-					arg0.anInt3407 = 0;
-					arg0.anInt3396 = 0;
-					SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, PlayerList.self == arg0, arg0.anInt3407);
-				}
-				arg0.anInt3388 = arg0.anInt3407 + 1;
-				if (arg0.anInt3388 >= local18.frames.length) {
-					arg0.anInt3388 = 0;
-				}
-			}
-		}
-		@Pc(156) int local156;
-		if (arg0.spotAnimId != -1 && client.loop >= arg0.spotAnimStart) {
-			local156 = SpotAnimTypeList.get(arg0.spotAnimId).seqId;
-			if (local156 == -1) {
-				arg0.spotAnimId = -1;
-			} else {
-				@Pc(165) SeqType local165 = SeqTypeList.get(local156);
-				if (local165 == null || local165.frames == null) {
-					arg0.spotAnimId = -1;
-				} else {
-					if (arg0.anInt3399 < 0) {
-						arg0.anInt3399 = 0;
-						SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, 0);
-					}
-					arg0.anInt3361++;
-					if (arg0.anInt3399 < local165.frames.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) {
-						arg0.anInt3399++;
-						arg0.anInt3361 = 1;
-						SoundPlayer.playSeqSound(arg0.zFine, local165, arg0.xFine, PlayerList.self == arg0, arg0.anInt3399);
-					}
-					if (arg0.anInt3399 >= local165.frames.length) {
-						arg0.spotAnimId = -1;
-					}
-					arg0.anInt3418 = arg0.anInt3399 + 1;
-					if (local165.frames.length <= arg0.anInt3418) {
-						arg0.anInt3418 = -1;
-					}
-				}
-			}
-		}
-		if (arg0.seqId != -1 && arg0.anInt3420 <= 1) {
-			local18 = SeqTypeList.get(arg0.seqId);
-			if (local18.anInt5363 == 1 && arg0.anInt3405 > 0 && client.loop >= arg0.anInt3395 && client.loop > arg0.anInt3386) {
-				arg0.anInt3420 = 1;
-				return;
-			}
-		}
-		if (arg0.seqId != -1 && arg0.anInt3420 == 0) {
-			local18 = SeqTypeList.get(arg0.seqId);
-			if (local18 == null || local18.frames == null) {
-				arg0.seqId = -1;
-			} else {
-				arg0.anInt3360++;
-				if (arg0.anInt3425 < local18.frames.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) {
-					arg0.anInt3360 = 1;
-					arg0.anInt3425++;
-					SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, arg0 == PlayerList.self, arg0.anInt3425);
-				}
-				if (local18.frames.length <= arg0.anInt3425) {
-					arg0.anInt3425 -= local18.anInt5362;
-					arg0.anInt3371++;
-					if (arg0.anInt3371 >= local18.anInt5357) {
-						arg0.seqId = -1;
-					} else if (arg0.anInt3425 >= 0 && local18.frames.length > arg0.anInt3425) {
-						SoundPlayer.playSeqSound(arg0.zFine, local18, arg0.xFine, PlayerList.self == arg0, arg0.anInt3425);
-					} else {
-						arg0.seqId = -1;
-					}
-				}
-				arg0.anInt3373 = arg0.anInt3425 + 1;
-				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.frames.length) {
-						arg0.anInt3373 = -1;
-					}
-				}
-				arg0.aBoolean171 = local18.aBoolean279;
-			}
-		}
-		if (arg0.anInt3420 > 0) {
-			arg0.anInt3420--;
-		}
-		for (local156 = 0; local156 < arg0.aClass147Array3.length; local156++) {
-			@Pc(545) Npc_Class147 local545 = arg0.aClass147Array3[local156];
-			if (local545 != null) {
-				if (local545.anInt5408 > 0) {
-					local545.anInt5408--;
-				} else {
-					@Pc(570) SeqType local570 = SeqTypeList.get(local545.anInt5396);
-					if (local570 == null || local570.frames == null) {
-						arg0.aClass147Array3[local156] = null;
-					} else {
-						local545.anInt5404++;
-						if (local545.anInt5399 < local570.frames.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) {
-							local545.anInt5399++;
-							local545.anInt5404 = 1;
-							SoundPlayer.playSeqSound(arg0.zFine, local570, arg0.xFine, arg0 == PlayerList.self, 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.frames.length) {
-								SoundPlayer.playSeqSound(arg0.zFine, local570, arg0.xFine, PlayerList.self == arg0, local545.anInt5399);
-							} else {
-								arg0.aClass147Array3[local156] = null;
-							}
-						}
-						local545.anInt5398 = local545.anInt5399 + 1;
-						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.frames.length <= local545.anInt5398) {
-								local545.anInt5398 = -1;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
 }

client/src/main/java/rt4/Static37.java

@@ -1,191 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
 public final class Static37 {
 
-	@OriginalMember(owner = "client!cm", name = "c", descriptor = "I")
-	public static int anInt1176;
-
-    @OriginalMember(owner = "client!cm", name = "a", descriptor = "(ILclient!fe;)V")
-	public static void method949(@OriginalArg(1) PathingEntity arg0) {
-		if (arg0.anInt3376 == 0) {
-			return;
-		}
-		@Pc(13) BasType local13 = arg0.getBasType();
-		@Pc(43) int local43;
-		@Pc(36) int local36;
-		if (arg0.faceEntity != -1 && arg0.faceEntity < 32768) {
-			@Pc(26) Npc local26 = NpcList.npcs[arg0.faceEntity];
-			if (local26 != null) {
-				local36 = arg0.zFine - local26.zFine;
-				local43 = arg0.xFine - local26.xFine;
-				if (local43 != 0 || local36 != 0) {
-					arg0.anInt3400 = (int) (Math.atan2((double) local43, (double) local36) * 325.949D) & 0x7FF;
-				}
-			}
-		}
-		@Pc(94) int local94;
-		@Pc(70) int local70;
-		if (arg0.faceEntity >= 32768) {
-			local70 = arg0.faceEntity - 32768;
-			if (local70 == PlayerList.selfId) {
-				local70 = 2047;
-			}
-			@Pc(83) Player local83 = PlayerList.players[local70];
-			if (local83 != null) {
-				local94 = arg0.zFine - local83.zFine;
-				local36 = arg0.xFine - local83.xFine;
-				if (local36 != 0 || local94 != 0) {
-					arg0.anInt3400 = (int) (Math.atan2((double) local36, (double) local94) * 325.949D) & 0x7FF;
-				}
-			}
-		}
-		if ((arg0.faceX != 0 || arg0.faceY != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) {
-			local70 = arg0.xFine - (arg0.faceX - Static225.originX - Static225.originX) * 64;
-			local43 = arg0.zFine - (arg0.faceY - Static142.originZ - Static142.originZ) * 64;
-			if (local70 != 0 || local43 != 0) {
-				arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF;
-			}
-			arg0.faceY = 0;
-			arg0.faceX = 0;
-		}
-		local70 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
-		if (local70 == 0) {
-			arg0.anInt3385 = 0;
-			arg0.anInt3414 = 0;
-		} else if (local13.anInt1038 == 0) {
-			arg0.anInt3385++;
-			@Pc(226) boolean local226;
-			if (local70 > 1024) {
-				arg0.anInt3381 -= arg0.anInt3376;
-				local226 = true;
-				if (local70 < arg0.anInt3376 || local70 > 2048 - arg0.anInt3376) {
-					arg0.anInt3381 = arg0.anInt3400;
-					local226 = false;
-				}
-				if (local13.idleAnimationId == arg0.movementSeqId && (arg0.anInt3385 > 25 || local226)) {
-					if (local13.anInt1036 == -1) {
-						arg0.movementSeqId = local13.walkAnimation;
-					} else {
-						arg0.movementSeqId = local13.anInt1036;
-					}
-				}
-			} else {
-				local226 = true;
-				arg0.anInt3381 += arg0.anInt3376;
-				if (arg0.anInt3376 > local70 || local70 > 2048 - arg0.anInt3376) {
-					local226 = false;
-					arg0.anInt3381 = arg0.anInt3400;
-				}
-				if (local13.idleAnimationId == arg0.movementSeqId && (arg0.anInt3385 > 25 || local226)) {
-					if (local13.anInt1067 == -1) {
-						arg0.movementSeqId = local13.walkAnimation;
-					} else {
-						arg0.movementSeqId = local13.anInt1067;
-					}
-				}
-			}
-			arg0.anInt3381 &= 0x7FF;
-		} else {
-			if (local13.idleAnimationId == arg0.movementSeqId && arg0.anInt3385 > 25) {
-				if (local13.anInt1067 == -1) {
-					arg0.movementSeqId = local13.walkAnimation;
-				} else {
-					arg0.movementSeqId = local13.anInt1067;
-				}
-			}
-			local43 = arg0.anInt3400 << 5;
-			if (local43 != arg0.anInt3402) {
-				arg0.anInt3387 = 0;
-				arg0.anInt3402 = local43;
-				local36 = local43 - arg0.anInt3377 & 0xFFFF;
-				local94 = arg0.anInt3414 * arg0.anInt3414 / (local13.anInt1038 * 2);
-				@Pc(471) int local471;
-				if (arg0.anInt3414 > 0 && local36 >= local94 && local36 - local94 < 32768) {
-					arg0.anInt3397 = local36 / 2;
-					arg0.aBoolean167 = true;
-					local471 = local13.anInt1031 * local13.anInt1031 / (local13.anInt1038 * 2);
-					if (local471 > 32767) {
-						local471 = 32767;
-					}
-					if (local471 < arg0.anInt3397) {
-						arg0.anInt3397 = local36 - local471;
-					}
-				} else if (arg0.anInt3414 < 0 && local94 <= 65536 - local36 && 65536 - local36 - local94 < 32768) {
-					arg0.anInt3397 = (65536 - local36) / 2;
-					arg0.aBoolean167 = true;
-					local471 = local13.anInt1031 * local13.anInt1031 / (local13.anInt1038 * 2);
-					if (local471 > 32767) {
-						local471 = 32767;
-					}
-					if (local471 < arg0.anInt3397) {
-						arg0.anInt3397 = 65536 - local36 - local471;
-					}
-				} else {
-					arg0.aBoolean167 = false;
-				}
-			}
-			if (arg0.anInt3414 == 0) {
-				local36 = arg0.anInt3402 - arg0.anInt3377 & 0xFFFF;
-				if (local36 < local13.anInt1038) {
-					arg0.anInt3377 = arg0.anInt3402;
-				} else {
-					arg0.anInt3387 = 0;
-					local94 = local13.anInt1031 * local13.anInt1031 / (local13.anInt1038 * 2);
-					arg0.aBoolean167 = true;
-					if (local94 > 32767) {
-						local94 = 32767;
-					}
-					if (local36 >= 32768) {
-						arg0.anInt3414 = -local13.anInt1038;
-						arg0.anInt3397 = (65536 - local36) / 2;
-						if (local94 < arg0.anInt3397) {
-							arg0.anInt3397 = 65536 - local36 - local94;
-						}
-					} else {
-						arg0.anInt3414 = local13.anInt1038;
-						arg0.anInt3397 = local36 / 2;
-						if (local94 < arg0.anInt3397) {
-							arg0.anInt3397 = local36 - local94;
-						}
-					}
-				}
-			} else if (arg0.anInt3414 <= 0) {
-				if (arg0.anInt3387 >= arg0.anInt3397) {
-					arg0.aBoolean167 = false;
-				}
-				if (!arg0.aBoolean167) {
-					arg0.anInt3414 += local13.anInt1038;
-					if (arg0.anInt3414 > 0) {
-						arg0.anInt3414 = 0;
-					}
-				} else if (-local13.anInt1031 < arg0.anInt3414) {
-					arg0.anInt3414 -= local13.anInt1038;
-				}
-			} else {
-				if (arg0.anInt3397 <= arg0.anInt3387) {
-					arg0.aBoolean167 = false;
-				}
-				if (!arg0.aBoolean167) {
-					arg0.anInt3414 -= local13.anInt1038;
-					if (arg0.anInt3414 < 0) {
-						arg0.anInt3414 = 0;
-					}
-				} else if (arg0.anInt3414 < local13.anInt1031) {
-					arg0.anInt3414 += local13.anInt1038;
-				}
-			}
-			arg0.anInt3377 += arg0.anInt3414;
-			arg0.anInt3377 &= 0xFFFF;
-			if (arg0.anInt3414 <= 0) {
-				arg0.anInt3387 -= arg0.anInt3414;
-			} else {
-				arg0.anInt3387 += arg0.anInt3414;
-			}
-			arg0.anInt3381 = arg0.anInt3377 >> 5;
-		}
-	}
 }

client/src/main/java/rt4/Static4.java

@@ -2,7 +2,6 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static4 {
 
@@ -32,17 +31,4 @@ public final class Static4 {
 		Static228.method3909(arg0.length - 1, arg0, 0, arg1);
 	}
 
-	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(Lclient!na;I)I")
-	public static int method25(@OriginalArg(0) JagString arg0) {
-		if (arg0 == null) {
-			return -1;
-		}
-		for (@Pc(20) int local20 = 0; local20 < FriendsList.size; local20++) {
-			if (arg0.equalsIgnoreCase(FriendsList.usernames[local20])) {
-				return local20;
-			}
-		}
-		return -1;
-	}
-
 }

client/src/main/java/rt4/Static40.java

@@ -9,70 +9,6 @@ public final class Static40 {
 	@OriginalMember(owner = "client!da", name = "ab", descriptor = "I")
 	public static int anInt1275;
 
-	@OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V")
-	public static void updateLoginScreenCamera() {
-		if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) {
-			return;
-		}
-		@Pc(27) int local27 = (Static233.anInt5224 * (Static114.anInt5843 - Static228.anInt5101) >> 16) + Static228.anInt5101;
-		@Pc(30) float[] renderCoordinates = new float[3];
-		Static233.anInt5224 += local27;
-		if (Static233.anInt5224 >= 65535) {
-			Static233.anInt5224 = 65535;
-			if (Static186.aBoolean205) {
-				Static13.aBoolean16 = false;
-			} else {
-				Static13.aBoolean16 = true;
-			}
-			Static186.aBoolean205 = true;
-		} else {
-			Static186.aBoolean205 = false;
-			Static13.aBoolean16 = false;
-		}
-		@Pc(66) float local66 = (float) Static233.anInt5224 / 65535.0F;
-		@Pc(70) int local70 = Static127.anInt3125 * 2;
-		@Pc(141) int local141;
-		@Pc(131) int local131;
-		@Pc(111) int local111;
-		@Pc(119) int local119;
-		@Pc(146) int local146;
-		@Pc(155) int local155;
-		@Pc(173) int local173;
-		for (@Pc(72) int local72 = 0; local72 < 3; local72++) {
-			local111 = (Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] - Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 3][local72]) * 3;
-			local119 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72];
-			local131 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 1][local72] * 3;
-			local141 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70][local72] * 3;
-			local146 = local131 - local141;
-			local155 = local111 + local141 - local131 * 2;
-			local173 = Static107.anIntArrayArrayArray9[Static155.anInt3718][local70 + 2][local72] + local131 - local119 - local111;
-			renderCoordinates[local72] = (float) local119 + (((float) local173 * local66 + (float) local155) * local66 + (float) local146) * local66;
-		}
-		Static5.anInt40 = (int) renderCoordinates[1] * -1;
-		Static138.renderX = (int) renderCoordinates[0] - Static225.originX * 128;
-		Static134.renderZ = (int) renderCoordinates[2] - Static142.originZ * 128;
-		@Pc(226) float[] local226 = new float[3];
-		local141 = Static75.anInt2119 * 2;
-		for (local131 = 0; local131 < 3; local131++) {
-			local111 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131] * 3;
-			local146 = (Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] - Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 3][local131]) * 3;
-			local155 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141][local131];
-			local119 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 1][local131] * 3;
-			local173 = local119 - local111;
-			@Pc(313) int local313 = local146 + local111 - local119 * 2;
-			@Pc(331) int local331 = Static107.anIntArrayArrayArray9[Static52.anInt1694][local141 + 2][local131] + local119 - local146 - local155;
-			local226[local131] = (float) local155 + local66 * (local66 * (local66 * (float) local331 + (float) local313) + (float) local173);
-		}
-		@Pc(363) float local363 = local226[0] - renderCoordinates[0];
-		@Pc(371) float local371 = local226[2] - renderCoordinates[2];
-		@Pc(382) float local382 = (local226[1] - renderCoordinates[1]) * -1.0F;
-		@Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
-		Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
-		Static84.aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
-		Static240.cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
-		Static184.cameraYaw = (int) ((double) Static84.aFloat10 * 325.949D) & 0x7FF;
-	}
-
     @OriginalMember(owner = "client!da", name = "a", descriptor = "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;")
 	public static String method1014(@OriginalArg(0) String arg0, @OriginalArg(1) String arg1, @OriginalArg(3) String arg2) {
 		for (@Pc(5) int local5 = arg2.indexOf(arg0); local5 != -1; local5 = arg2.indexOf(arg0, local5 + arg1.length())) {

client/src/main/java/rt4/Static44.java

@@ -38,7 +38,7 @@ public final class Static44 {
 				NpcList.npcs[local35].faceEntity = -1;
 			}
 		}
-		Static102.method2073();
+		Inv.method2073();
 		Static227.cameraType = 1;
 		client.setGameState(30);
 		for (local35 = 0; local35 < 100; local35++) {
@@ -94,12 +94,4 @@ public final class Static44 {
 		return local9;
 	}
 
-	@OriginalMember(owner = "client!dh", name = "a", descriptor = "(Lclient!na;I)V")
-	public static void method1149(@OriginalArg(0) JagString arg0) {
-		@Pc(7) int local7 = Static91.method1879(arg0);
-		if (local7 != -1) {
-			Static80.method3616(WorldMap.labels.aShortArray73[local7], WorldMap.labels.aShortArray72[local7]);
-		}
-	}
-
 }

client/src/main/java/rt4/Static49.java

@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static49 {
 
-	@OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;")
-	public static final JagString PERCENT_SIGN = JagString.parse("(U");
-
     @OriginalMember(owner = "client!dm", name = "a", descriptor = "(BII[B)Z")
 	public static boolean method1201(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2) {
 		@Pc(15) boolean local15 = true;

client/src/main/java/rt4/Static6.java

@@ -9,9 +9,6 @@ public final class Static6 {
     @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;")
 	public static final JagString aClass100_17 = JagString.parse("0");
 
-    @OriginalMember(owner = "client!ag", name = "cb", descriptor = "[Lclient!cl;")
-	public static final AnimFrameset[] aClass3_Sub2_Sub7Array1 = new AnimFrameset[14];
-
     @OriginalMember(owner = "client!ag", name = "j", descriptor = "(I)V")
 	public static void method84() {
 		SceneGraph.clear();

client/src/main/java/rt4/Static61.java

@@ -10,7 +10,4 @@ public final class Static61 {
 	@OriginalMember(owner = "client!en", name = "h", descriptor = "Lclient!na;")
 	public static final JagString CHALREQ = JagString.parse(":chalreq:");
 
-	@OriginalMember(owner = "client!en", name = "t", descriptor = "[I")
-	public static final int[] anIntArray148 = new int[14];
-
 }

client/src/main/java/rt4/Static71.java

@@ -8,10 +8,7 @@ public final class Static71 {
 	@OriginalMember(owner = "client!fk", name = "j", descriptor = "[[I")
 	public static int[][] anIntArrayArray10;
 
-    @OriginalMember(owner = "client!fk", name = "k", descriptor = "[I")
+    @OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V")
-	public static final int[] anIntArray147 = new int[14];
-
-	@OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V")
 	public static void method1444() {
 		for (@Pc(7) int local7 = -1; local7 < PlayerList.size; local7++) {
 			@Pc(21) int local21;
@@ -22,7 +19,7 @@ public final class Static71 {
 			}
 			@Pc(31) Player local31 = PlayerList.players[local21];
 			if (local31 != null) {
-				Static263.method4514(local31.getSize(), local31);
+				NpcList.method4514(local31.getSize(), local31);
 			}
 		}
 	}

client/src/main/java/rt4/Static73.java

@@ -43,10 +43,10 @@ public final class Static73 {
 			Static138.renderX = Static245.anInt5375 << 7;
 			Static134.renderZ = Static248.anInt4232 << 7;
 		} else {
-			Static40.updateLoginScreenCamera();
+			Camera.updateLoginScreenCamera();
 		}
 		Static86.setInstantFade();
-		Static26.setupLoadingScreenRegion();
+		LoginManager.setupLoadingScreenRegion();
 		client.setGameState(28);
 	}
 

client/src/main/java/rt4/Static80.java

@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static80 {
 
@@ -21,26 +19,4 @@ public final class Static80 {
 	@OriginalMember(owner = "client!gf", name = "S", descriptor = "[I")
 	public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 };
 
-	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(BII)V")
-	public static void method3616(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		WorldMap.anInt3482 = arg0 - WorldMap.originX;
-		@Pc(24) int local24 = WorldMap.anInt3482 - (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom);
-		@Pc(33) int local33 = WorldMap.anInt3482 + (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom);
-		if (local24 < 0) {
-			WorldMap.anInt3482 = (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom);
-		}
-		WorldMap.anInt4901 = WorldMap.length + WorldMap.originZ - arg1 - 1;
-		@Pc(61) int local61 = (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom) + WorldMap.anInt4901;
-		@Pc(70) int local70 = WorldMap.anInt4901 - (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom);
-		if (local33 > WorldMap.width) {
-			WorldMap.anInt3482 = WorldMap.width - (int) ((float) WorldMap.component.anInt445 / WorldMap.zoom);
-		}
-		if (local70 < 0) {
-			WorldMap.anInt4901 = (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom);
-		}
-		if (WorldMap.length < local61) {
-			WorldMap.anInt4901 = WorldMap.length - (int) ((float) WorldMap.component.anInt459 / WorldMap.zoom);
-		}
-	}
-
 }

client/src/main/java/rt4/Static87.java

@@ -490,9 +490,9 @@ public final class Static87 {
 										}
 									} else if (local30.aBoolean30) {
 										if (GlRenderer.enabled) {
-											GlRaster.method1182(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF));
+											GlRaster.fillRectAlpha(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF));
 										} else {
-											SoftwareRaster.method2484(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF));
+											SoftwareRaster.fillRectAlpha(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF));
 										}
 									} else if (GlRenderer.enabled) {
 										GlRaster.method1180(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF));
@@ -760,7 +760,7 @@ public final class Static87 {
 															local556 = local123 + memory * (local30.anInt512 + 115);
 															local545 = (local30.anInt516 + 12) * local468 + local114;
 															if (local30.anInt460 == 0) {
-																local1921.method2857(local3159, local556, local545, local30.color, local30.aBoolean28 ? 0 : -1);
+																local1921.renderLeft(local3159, local556, local545, local30.color, local30.aBoolean28 ? 0 : -1);
 															} else if (local30.anInt460 == 1) {
 																local1921.renderCenter(local3159, local556 + 57, local545, local30.color, local30.aBoolean28 ? 0 : -1);
 															} else {
@@ -825,7 +825,7 @@ public final class Static87 {
 														local3325 = local3297.substring(local563, 0);
 														local3297 = local3297.substring(local563 + 4);
 													}
-													local3299.method2857(local3325, cardMemory + 3, local545, 0, -1);
+													local3299.renderLeft(local3325, cardMemory + 3, local545, 0, -1);
 													local545 += local3299.lineHeight + 1;
 												}
 											}

client/src/main/java/rt4/Static89.java

@@ -10,9 +10,6 @@ public final class Static89 {
 	@OriginalMember(owner = "client!ha", name = "k", descriptor = "[[Z")
 	public static boolean[][] aBooleanArrayArray3;
 
-	@OriginalMember(owner = "client!ha", name = "o", descriptor = "I")
-	public static int anInt2387;
-
     @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V")
 	public static void method1835(@OriginalArg(0) boolean arg0) {
 		@Pc(11) byte local11;
@@ -171,15 +168,15 @@ public final class Static89 {
 			for (@Pc(189) int local189 = 0; local189 < InterfaceList.anInt766; local189++) {
 				if (Static223.aBooleanArray116[local189]) {
 					if (GlRenderer.enabled) {
-						GlRaster.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128);
+						GlRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128);
 					} else {
-						SoftwareRaster.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128);
+						SoftwareRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128);
 					}
 				} else if (InterfaceList.rectangleRedraw[local189]) {
 					if (GlRenderer.enabled) {
-						GlRaster.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128);
+						GlRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128);
 					} else {
-						SoftwareRaster.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128);
+						SoftwareRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128);
 					}
 				}
 			}

client/src/main/java/rt4/Static90.java

@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static90 {
@@ -8,9 +7,4 @@ public final class Static90 {
     @OriginalMember(owner = "client!hb", name = "t", descriptor = "[I")
 	public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 };
 
-    @OriginalMember(owner = "client!hb", name = "b", descriptor = "(II)Z")
-	public static boolean method1855(@OriginalArg(0) int arg0) {
-		return arg0 >= 0 && MapList.aBooleanArray130.length > arg0 ? MapList.aBooleanArray130[arg0] : false;
-	}
-
 }

client/src/main/java/rt4/Static91.java

@@ -9,19 +9,6 @@ public final class Static91 {
     @OriginalMember(owner = "client!hc", name = "P", descriptor = "I")
 	public static int anInt2428;
 
-    @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!na;Z)I")
-	public static int method1879(@OriginalArg(0) JagString arg0) {
-		if (WorldMap.labels == null || arg0.length() == 0) {
-			return -1;
-		}
-		for (@Pc(20) int local20 = 0; local20 < WorldMap.labels.anInt5074; local20++) {
-			if (WorldMap.labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).strEquals(arg0)) {
-				return local20;
-			}
-		}
-		return -1;
-	}
-
 	@OriginalMember(owner = "client!hc", name = "a", descriptor = "(IIIILclient!th;Lclient!th;IIIIJ)V")
 	public static void method1880(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) long arg10) {
 		if (arg4 == null) {

client/src/main/java/rt4/WorldMap.java

@@ -89,6 +89,12 @@ public class WorldMap {
     public static Sprite aClass3_Sub2_Sub1_2;
     @OriginalMember(owner = "client!mc", name = "S", descriptor = "Lclient!mm;")
     public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_2;
+    @OriginalMember(owner = "client!ha", name = "o", descriptor = "I")
+    public static int anInt2387;
+    @OriginalMember(owner = "client!cm", name = "c", descriptor = "I")
+    public static int anInt1176;
+    @OriginalMember(owner = "client!sm", name = "m", descriptor = "I")
+    public static int anInt5212;
 
     @OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V")
     public static void method3413() {
@@ -998,4 +1004,93 @@ public class WorldMap {
             aClass100_724 = null;
         }
     }
+
+    @OriginalMember(owner = "client!va", name = "c", descriptor = "(BI)V")
+    public static void method4444(@OriginalArg(1) int arg0) {
+        Static9.anInt172 = arg0;
+        Static91.anInt2428 = 20;
+        Static201.anInt1864 = 3;
+    }
+
+    @OriginalMember(owner = "client!ab", name = "a", descriptor = "(Lclient!na;I)V")
+    public static void method4656(@OriginalArg(0) JagString arg0) {
+        @Pc(9) int local9 = Static171.method3218(arg0);
+        if (local9 != -1) {
+            method3616(labels.aShortArray73[local9], labels.aShortArray72[local9]);
+        }
+    }
+
+    @OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;")
+    public static JagString method923(@OriginalArg(0) JagString arg0) {
+        @Pc(12) int local12 = Static171.method3218(arg0);
+        return local12 == -1 ? Static211.aClass100_517 : labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872);
+    }
+
+    @OriginalMember(owner = "client!rg", name = "d", descriptor = "(B)Lclient!bn;")
+    public static Map method4361() {
+        return currentMap;
+    }
+
+    @OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I")
+	public static int method2352() {
+		anInt5212 = 0;
+		return method2385();
+	}
+
+    @OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
+    public static int method2385() {
+        if (labels == null) {
+            return -1;
+        }
+        while (anInt5212 < labels.anInt5074) {
+            if (labels.method3897(anInt5212)) {
+                return anInt5212++;
+            }
+            anInt5212++;
+        }
+        return -1;
+    }
+
+    @OriginalMember(owner = "client!gf", name = "a", descriptor = "(BII)V")
+    public static void method3616(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+        anInt3482 = arg0 - originX;
+        @Pc(24) int local24 = anInt3482 - (int) ((float) component.anInt445 / zoom);
+        @Pc(33) int local33 = anInt3482 + (int) ((float) component.anInt445 / zoom);
+        if (local24 < 0) {
+            anInt3482 = (int) ((float) component.anInt445 / zoom);
+        }
+        anInt4901 = length + originZ - arg1 - 1;
+        @Pc(61) int local61 = (int) ((float) component.anInt459 / zoom) + anInt4901;
+        @Pc(70) int local70 = anInt4901 - (int) ((float) component.anInt459 / zoom);
+        if (local33 > width) {
+            anInt3482 = width - (int) ((float) component.anInt445 / zoom);
+        }
+        if (local70 < 0) {
+            anInt4901 = (int) ((float) component.anInt459 / zoom);
+        }
+        if (length < local61) {
+            anInt4901 = length - (int) ((float) component.anInt459 / zoom);
+        }
+    }
+
+    @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Lclient!na;I)V")
+    public static void method1149(@OriginalArg(0) JagString arg0) {
+        @Pc(7) int local7 = method1879(arg0);
+        if (local7 != -1) {
+            method3616(labels.aShortArray73[local7], labels.aShortArray72[local7]);
+        }
+    }
+
+    @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!na;Z)I")
+	public static int method1879(@OriginalArg(0) JagString arg0) {
+		if (labels == null || arg0.length() == 0) {
+			return -1;
+		}
+		for (@Pc(20) int local20 = 0; local20 < labels.anInt5074; local20++) {
+			if (labels.aClass100Array153[local20].method3140(Static101.aClass100_538, Static197.aClass100_872).strEquals(arg0)) {
+				return local20;
+			}
+		}
+		return -1;
+	}
 }

client/src/main/java/rt4/client.java

@@ -5,6 +5,7 @@ import java.awt.Graphics;
 import java.awt.Insets;
 import java.io.IOException;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Random;
@@ -213,7 +214,7 @@ public final class client extends GameShell {
 			}
 			advertSuppressed = false;
 			try {
-				@Pc(63) byte[] local63 = arg0[2].getBytes("ISO-8859-1");
+				@Pc(63) byte[] local63 = arg0[2].getBytes(StandardCharsets.ISO_8859_1);
 				local15 = Static101.method2053(JagString.decodeString(local63, local63.length, 0));
 			} catch (@Pc(74) Exception local74) {
 			}
@@ -497,7 +498,7 @@ public final class client extends GameShell {
         Static183.prevClickTime = 0L;
         MouseRecorder.instance.samples = 0;
         focus = true;
-        Static114.method4625();
+        ReflectionCheck.method4625();
         Protocol.opcode4 = -1;
         Protocol.opcode3 = -1;
         Protocol.opcode = -1;
@@ -543,11 +544,11 @@ public final class client extends GameShell {
         PlayerList.self = PlayerList.players[2047] = new Player();
         Static217.aClass69_116.clear();
         Static99.aClass69_64.clear();
-        if (Static159.objStacks != null) {
+        if (SceneGraph.objStacks != null) {
             for (local3506 = 0; local3506 < 4; local3506++) {
                 for (@Pc(3663) int local3663 = 0; local3663 < 104; local3663++) {
                     for (@Pc(3670) int local3670 = 0; local3670 < 104; local3670++) {
-                        Static159.objStacks[local3506][local3663][local3670] = null;
+                        SceneGraph.objStacks[local3506][local3663][local3670] = null;
                     }
                 }
             }
@@ -588,7 +589,7 @@ public final class client extends GameShell {
             Player.secondaryOptions[local3506] = false;
             Player.cursors[local3506] = -1;
         }
-        Static102.method2073();
+        Inv.method2073();
         Static19.aBoolean43 = true;
         for (local3506 = 0; local3506 < 100; local3506++) {
             Static186.aBooleanArray100[local3506] = true;
@@ -999,9 +1000,9 @@ public final class client extends GameShell {
 							}
 						}
 					}
-					Static104.method2247(local66);
+					NpcList.method2247(local66);
-					Static37.method949(local66);
+					NpcList.method949(local66);
-					Static34.method879(local66);
+					NpcList.method879(local66);
 					PathFinder.collisionMaps[Player.level].flagScenery(local66.xFine >> 7, false, local66.zFine >> 7, local66.getSize(), local66.getSize());
 				}
 			}
@@ -1010,12 +1011,12 @@ public final class client extends GameShell {
 			Flames.update();
 		} else if (LoginManager.step == 0 && CreateManager.step == 0) {
 			if (Static227.cameraType == 2) {
-				Static125.updateLockedCamera();
+				Camera.updateLockedCamera();
 			} else {
-				Static40.updateLoginScreenCamera();
+				Camera.updateLoginScreenCamera();
 			}
 			if (Static138.renderX >> 7 < 14 || Static138.renderX >> 7 >= 90 || Static134.renderZ >> 7 < 14 || Static134.renderZ >> 7 >= 90) {
-				Static26.setupLoadingScreenRegion();
+				LoginManager.setupLoadingScreenRegion();
 			}
 		}
 		while (true) {
@@ -1270,7 +1271,7 @@ public final class client extends GameShell {
 				mainLoadState = 45;
 			} else {
 				if (percentage != 0) {
-					mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, JagString.parseInt(percentage), Static49.PERCENT_SIGN});
+					mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, JagString.parseInt(percentage), Static127.PERCENT_SIGN});
 				}
 				mainLoadPercentage = 20;
 			}
@@ -1297,7 +1298,7 @@ public final class client extends GameShell {
 				mainLoadPercentage = 35;
 				mainLoadState = 60;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, JagString.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, JagString.parseInt(percentage * 100 / i), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 35;
 			}
 		} else if (mainLoadState == 60) {
@@ -1308,7 +1309,7 @@ public final class client extends GameShell {
 				mainLoadState = 65;
 				mainLoadPercentage = 40;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, JagString.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, JagString.parseInt(percentage * 100 / i), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 40;
 			}
 		} else if (mainLoadState == 65) {
@@ -1367,14 +1368,14 @@ public final class client extends GameShell {
 				Equipment.init();
 				mainLoadState = 80;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, JagString.parseInt(percentage / 11), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, JagString.parseInt(percentage / 11), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 50;
 			}
 		} else if (mainLoadState == 80) {
 			percentage = Sprites.getReady(js5Archive8);
 			i = Sprites.total();
 			if (i > percentage) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, JagString.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, JagString.parseInt(percentage * 100 / i), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 60;
 			} else {
 				Sprites.load(js5Archive8);
@@ -1402,7 +1403,7 @@ public final class client extends GameShell {
 				mainLoadState = 100;
 				mainLoadPercentage = 70;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, JagString.parseInt(js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, JagString.parseInt(js5Archive26.getPercentageComplete()), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 70;
 			}
 		} else if (mainLoadState == 100) {
@@ -1428,13 +1429,13 @@ public final class client extends GameShell {
 			}
 		} else if (mainLoadState == 130) {
 			if (!js5Archive3.fetchAll()) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			} else if (!js5Archive12.fetchAll()) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			} else if (!js5Archive13.fetchAll()) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			} else if (js5Archive23.allFilesComplete(Static165.DETAILS)) {
 				MapList.init(Sprites.mapfunctions, js5Archive23);
@@ -1442,7 +1443,7 @@ public final class client extends GameShell {
 				mainLoadSecondaryText = LocalizedText.MAINLOAD130B;
 				mainLoadState = 135;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static127.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			}
 		} else if (mainLoadState == 135) {