Refactor client.mainLoad

client/src/main/java/AreaSound.java

@@ -96,7 +96,7 @@ public final class AreaSound extends Node {
 			this.anInt2042 = this.aClass8_Sub4_Sub1_1.anInt1664 * 128;
 		}
 		if (this.anInt2044 != local8 && this.aClass3_Sub3_Sub1_1 != null) {
-			Static204.aClass3_Sub3_Sub2_1.method1347(this.aClass3_Sub3_Sub1_1);
+			Static204.soundStream.method1347(this.aClass3_Sub3_Sub1_1);
 			this.aClass3_Sub3_Sub1_1 = null;
 		}
 	}

client/src/main/java/AudioChannel.java

@@ -58,6 +58,66 @@ public class AudioChannel {
 	@OriginalMember(owner = "client!vh", name = "C", descriptor = "I")
 	private int anInt4636 = 0;
 
+    @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIZ)V")
+    public static void init(@OriginalArg(3) boolean arg0) {
+        Static258.anInt5637 = 2;
+        stereo = arg0;
+        Static44.sampleRate = 22050;
+    }
+
+	@OriginalMember(owner = "client!id", name = "a", descriptor = "(ILsignlink!ll;Ljava/awt/Component;II)Lclient!vh;")
+	public static AudioChannel create(@OriginalArg(0) int arg0, @OriginalArg(1) SignLink arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
+		if (Static44.sampleRate == 0) {
+			throw new IllegalStateException();
+		}
+		try {
+			@Pc(33) AudioChannel local33 = (AudioChannel) Class.forName("JavaAudioChannel").getDeclaredConstructor().newInstance();
+			local33.anInt4641 = arg0;
+			local33.anIntArray411 = new int[(stereo ? 2 : 1) * 256];
+			local33.init(arg2);
+			local33.anInt4644 = (arg0 & -1024) + 1024;
+			if (local33.anInt4644 > 16384) {
+				local33.anInt4644 = 16384;
+			}
+			local33.open(local33.anInt4644);
+			if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
+				Static60.aClass19_1 = new AudioThread();
+				Static60.aClass19_1.signLink = arg1;
+				arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
+			}
+			if (Static60.aClass19_1 != null) {
+				if (Static60.aClass19_1.channels[arg3] != null) {
+					throw new IllegalArgumentException();
+				}
+				Static60.aClass19_1.channels[arg3] = local33;
+			}
+			return local33;
+		} catch (@Pc(109) Throwable local109) {
+			try {
+				@Pc(120) SignLinkAudioChannel local120 = new SignLinkAudioChannel(arg1, arg3);
+				local120.anIntArray411 = new int[(stereo ? 2 : 1) * 256];
+				local120.anInt4641 = arg0;
+				local120.init(arg2);
+				local120.anInt4644 = 16384;
+				local120.open(local120.anInt4644);
+				if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
+					Static60.aClass19_1 = new AudioThread();
+					Static60.aClass19_1.signLink = arg1;
+					arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
+				}
+				if (Static60.aClass19_1 != null) {
+					if (Static60.aClass19_1.channels[arg3] != null) {
+						throw new IllegalArgumentException();
+					}
+					Static60.aClass19_1.channels[arg3] = local120;
+				}
+				return local120;
+			} catch (@Pc(186) Throwable local186) {
+				return new AudioChannel();
+			}
+		}
+	}
+
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "()V")
 	protected void write() throws Exception {
 	}
@@ -168,7 +228,7 @@ public class AudioChannel {
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(B)V")
-	public final synchronized void method3565() {
+	public final synchronized void loop() {
 		if (this.anIntArray411 == null) {
 			return;
 		}
@@ -242,7 +302,7 @@ public class AudioChannel {
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!qb;)V")
-	public final synchronized void method3566(@OriginalArg(1) PcmStream arg0) {
+	public final synchronized void setStream(@OriginalArg(1) PcmStream arg0) {
 		this.aClass3_Sub3_6 = arg0;
 	}
 
@@ -300,16 +360,16 @@ public class AudioChannel {
 		if (Static60.aClass19_1 != null) {
 			@Pc(6) boolean local6 = true;
 			for (@Pc(8) int local8 = 0; local8 < 2; local8++) {
-				if (Static60.aClass19_1.aClass62Array1[local8] == this) {
-					Static60.aClass19_1.aClass62Array1[local8] = null;
+				if (Static60.aClass19_1.channels[local8] == this) {
+					Static60.aClass19_1.channels[local8] = null;
 				}
-				if (Static60.aClass19_1.aClass62Array1[local8] != null) {
+				if (Static60.aClass19_1.channels[local8] != null) {
 					local6 = false;
 				}
 			}
 			if (local6) {
-				Static60.aClass19_1.aBoolean62 = true;
-				while (Static60.aClass19_1.aBoolean64) {
+				Static60.aClass19_1.stop = true;
+				while (Static60.aClass19_1.running) {
 					Static231.sleep(50L);
 				}
 				Static60.aClass19_1 = null;

client/src/main/java/AudioThread.java

@@ -6,36 +6,36 @@ import org.openrs2.deob.annotation.Pc;
 public final class AudioThread implements Runnable {
 
 	@OriginalMember(owner = "client!cj", name = "m", descriptor = "Lsignlink!ll;")
-	public SignLink aClass213_1;
+	public SignLink signLink;
 
 	@OriginalMember(owner = "client!cj", name = "p", descriptor = "[Lclient!vh;")
-	public final AudioChannel[] aClass62Array1 = new AudioChannel[2];
+	public final AudioChannel[] channels = new AudioChannel[2];
 
 	@OriginalMember(owner = "client!cj", name = "g", descriptor = "Z")
-	public volatile boolean aBoolean62 = false;
+	public volatile boolean stop = false;
 
 	@OriginalMember(owner = "client!cj", name = "t", descriptor = "Z")
-	public volatile boolean aBoolean64 = false;
+	public volatile boolean running = false;
 
 	@OriginalMember(owner = "client!cj", name = "run", descriptor = "()V")
 	@Override
 	public final void run() {
-		this.aBoolean64 = true;
+		this.running = true;
 		try {
-			while (!this.aBoolean62) {
-				for (@Pc(9) int local9 = 0; local9 < 2; local9++) {
-					@Pc(19) AudioChannel local19 = this.aClass62Array1[local9];
-					if (local19 != null) {
-						local19.method3565();
+			while (!this.stop) {
+				for (@Pc(9) int i = 0; i < 2; i++) {
+					@Pc(19) AudioChannel channel = this.channels[i];
+					if (channel != null) {
+						channel.loop();
 					}
 				}
 				Static231.sleep(10L);
-				GameShell.flush(this.aClass213_1, null);
+				GameShell.flush(this.signLink, null);
 			}
-		} catch (@Pc(43) Exception local43) {
-			Static89.report(null, local43);
+		} catch (@Pc(43) Exception ex) {
+			Static89.report(null, ex);
 		} finally {
-			this.aBoolean64 = false;
+			this.running = false;
 		}
 	}
 }

client/src/main/java/BufferedImageFrameBuffer.java

@@ -40,7 +40,7 @@ public final class BufferedImageFrameBuffer extends FrameBuffer {
 
 	@OriginalMember(owner = "client!ti", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V")
 	@Override
-	public final void method4191(@OriginalArg(0) int width, @OriginalArg(1) int x, @OriginalArg(3) int height, @OriginalArg(4) Graphics graphics, @OriginalArg(5) int y) {
+	public final void drawAt(@OriginalArg(0) int width, @OriginalArg(1) int x, @OriginalArg(3) int height, @OriginalArg(4) Graphics graphics, @OriginalArg(5) int y) {
 		@Pc(2) Shape clip = graphics.getClip();
 		graphics.clipRect(x, y, width, height);
 		graphics.drawImage(this.image, 0, 0, this.component);

client/src/main/java/ByteArray.java

@@ -6,8 +6,8 @@ import org.openrs2.deob.annotation.OriginalMember;
 public abstract class ByteArray {
 
 	@OriginalMember(owner = "client!u", name = "a", descriptor = "(I)[B")
-	public abstract byte[] method4236();
+	public abstract byte[] get();
 
 	@OriginalMember(owner = "client!u", name = "a", descriptor = "(I[B)V")
-	public abstract void method4238(@OriginalArg(1) byte[] arg0);
+	public abstract void set(@OriginalArg(1) byte[] bytes);
 }

client/src/main/java/DirectByteArray.java

@@ -8,22 +8,22 @@ import org.openrs2.deob.annotation.Pc;
 public final class DirectByteArray extends ByteArray {
 
 	@OriginalMember(owner = "client!ua", name = "m", descriptor = "Ljava/nio/ByteBuffer;")
-	private ByteBuffer aByteBuffer10;
+	private ByteBuffer buffer;
 
 	@OriginalMember(owner = "client!ua", name = "a", descriptor = "(I[B)V")
 	@Override
-	public final void method4238(@OriginalArg(1) byte[] arg0) {
-		this.aByteBuffer10 = ByteBuffer.allocateDirect(arg0.length);
-		this.aByteBuffer10.position(0);
-		this.aByteBuffer10.put(arg0);
+	public final void set(@OriginalArg(1) byte[] bytes) {
+		this.buffer = ByteBuffer.allocateDirect(bytes.length);
+		this.buffer.position(0);
+		this.buffer.put(bytes);
 	}
 
 	@OriginalMember(owner = "client!ua", name = "a", descriptor = "(I)[B")
 	@Override
-	public final byte[] method4236() {
-		@Pc(4) byte[] local4 = new byte[this.aByteBuffer10.capacity()];
-		this.aByteBuffer10.position(0);
-		this.aByteBuffer10.get(local4);
-		return local4;
+	public final byte[] get() {
+		@Pc(4) byte[] bytes = new byte[this.buffer.capacity()];
+		this.buffer.position(0);
+		this.buffer.get(bytes);
+		return bytes;
 	}
 }

client/src/main/java/FrameBuffer.java

@@ -21,7 +21,7 @@ public abstract class FrameBuffer {
 	protected int width;
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IILjava/awt/Graphics;I)V")
-	public abstract void draw(@OriginalArg(2) Graphics arg0);
+	public abstract void draw(@OriginalArg(2) Graphics graphics);
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(I)V")
 	public final void makeTarget() {
@@ -29,8 +29,8 @@ public abstract class FrameBuffer {
 	}
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V")
-	public abstract void method4191(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Graphics arg3, @OriginalArg(5) int arg4);
+	public abstract void drawAt(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Graphics graphics, @OriginalArg(5) int arg4);
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IZILjava/awt/Component;)V")
-	public abstract void init(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2);
+	public abstract void init(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component);
 }

client/src/main/java/GameCanvas.java

@@ -9,22 +9,22 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class GameCanvas extends Canvas {
 
 	@OriginalMember(owner = "client!tm", name = "m", descriptor = "Ljava/awt/Component;")
-	private final Component aComponent2;
+	private final Component component;
 
 	@OriginalMember(owner = "client!tm", name = "<init>", descriptor = "(Ljava/awt/Component;)V")
-	public GameCanvas(@OriginalArg(0) Component arg0) {
-		this.aComponent2 = arg0;
+	public GameCanvas(@OriginalArg(0) Component component) {
+		this.component = component;
 	}
 
 	@OriginalMember(owner = "client!tm", name = "update", descriptor = "(Ljava/awt/Graphics;)V")
 	@Override
-	public final void update(@OriginalArg(0) Graphics arg0) {
-		this.aComponent2.update(arg0);
+	public final void update(@OriginalArg(0) Graphics graphics) {
+		this.component.update(graphics);
 	}
 
 	@OriginalMember(owner = "client!tm", name = "paint", descriptor = "(Ljava/awt/Graphics;)V")
 	@Override
-	public final void paint(@OriginalArg(0) Graphics arg0) {
-		this.aComponent2.paint(arg0);
+	public final void paint(@OriginalArg(0) Graphics graphics) {
+		this.component.paint(graphics);
 	}
 }

client/src/main/java/ImageProducerFrameBuffer.java

@@ -17,99 +17,99 @@ import org.openrs2.deob.annotation.Pc;
 public final class ImageProducerFrameBuffer extends FrameBuffer implements ImageProducer, ImageObserver {
 
 	@OriginalMember(owner = "client!di", name = "A", descriptor = "Ljava/awt/image/ImageConsumer;")
-	private ImageConsumer anImageConsumer1;
+	private ImageConsumer imageConsumer;
 
 	@OriginalMember(owner = "client!di", name = "B", descriptor = "Ljava/awt/image/ColorModel;")
-	private ColorModel aColorModel1;
+	private ColorModel colorModel;
 
 	@OriginalMember(owner = "client!di", name = "addConsumer", descriptor = "(Ljava/awt/image/ImageConsumer;)V")
 	@Override
-	public final synchronized void addConsumer(@OriginalArg(0) ImageConsumer arg0) {
-		this.anImageConsumer1 = arg0;
-		arg0.setDimensions(this.width, this.height);
-		arg0.setProperties(null);
-		arg0.setColorModel(this.aColorModel1);
-		arg0.setHints(14);
+	public final synchronized void addConsumer(@OriginalArg(0) ImageConsumer consumer) {
+		this.imageConsumer = consumer;
+		consumer.setDimensions(this.width, this.height);
+		consumer.setProperties(null);
+		consumer.setColorModel(this.colorModel);
+		consumer.setHints(14);
 	}
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IIIBI)V")
-	private synchronized void method1168(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
-		if (this.anImageConsumer1 != null) {
-			this.anImageConsumer1.setPixels(arg2, arg3, arg0, arg1, this.aColorModel1, this.pixels, arg3 * this.width + arg2, this.width);
-			this.anImageConsumer1.imageComplete(2);
+	private synchronized void method1168(@OriginalArg(0) int width, @OriginalArg(1) int height, @OriginalArg(2) int x, @OriginalArg(4) int y) {
+		if (this.imageConsumer != null) {
+			this.imageConsumer.setPixels(x, y, width, height, this.colorModel, this.pixels, y * this.width + x, this.width);
+			this.imageConsumer.imageComplete(2);
 		}
 	}
 
 	@OriginalMember(owner = "client!di", name = "removeConsumer", descriptor = "(Ljava/awt/image/ImageConsumer;)V")
 	@Override
-	public final synchronized void removeConsumer(@OriginalArg(0) ImageConsumer arg0) {
-		if (this.anImageConsumer1 == arg0) {
-			this.anImageConsumer1 = null;
+	public final synchronized void removeConsumer(@OriginalArg(0) ImageConsumer consumer) {
+		if (this.imageConsumer == consumer) {
+			this.imageConsumer = null;
 		}
 	}
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V")
 	@Override
-	public final void method4191(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Graphics arg3, @OriginalArg(5) int arg4) {
-		this.method1168(arg0, arg2, arg1, arg4);
-		@Pc(17) Shape local17 = arg3.getClip();
-		arg3.clipRect(arg1, arg4, arg0, arg2);
-		arg3.drawImage(this.image, 0, 0, this);
-		arg3.setClip(local17);
+	public final void drawAt(@OriginalArg(0) int width, @OriginalArg(1) int x, @OriginalArg(3) int height, @OriginalArg(4) Graphics graphics, @OriginalArg(5) int y) {
+		this.method1168(width, height, x, y);
+		@Pc(17) Shape shape = graphics.getClip();
+		graphics.clipRect(x, y, width, height);
+		graphics.drawImage(this.image, 0, 0, this);
+		graphics.setClip(shape);
 	}
 
 	@OriginalMember(owner = "client!di", name = "startProduction", descriptor = "(Ljava/awt/image/ImageConsumer;)V")
 	@Override
-	public final void startProduction(@OriginalArg(0) ImageConsumer arg0) {
-		this.addConsumer(arg0);
+	public final void startProduction(@OriginalArg(0) ImageConsumer consumer) {
+		this.addConsumer(consumer);
 	}
 
 	@OriginalMember(owner = "client!di", name = "c", descriptor = "(I)V")
-	private synchronized void method1170() {
-		if (this.anImageConsumer1 != null) {
-			this.anImageConsumer1.setPixels(0, 0, this.width, this.height, this.aColorModel1, this.pixels, 0, this.width);
-			this.anImageConsumer1.imageComplete(2);
+	private synchronized void setPixels() {
+		if (this.imageConsumer != null) {
+			this.imageConsumer.setPixels(0, 0, this.width, this.height, this.colorModel, this.pixels, 0, this.width);
+			this.imageConsumer.imageComplete(2);
 		}
 	}
 
 	@OriginalMember(owner = "client!di", name = "isConsumer", descriptor = "(Ljava/awt/image/ImageConsumer;)Z")
 	@Override
-	public final synchronized boolean isConsumer(@OriginalArg(0) ImageConsumer arg0) {
-		return this.anImageConsumer1 == arg0;
+	public final synchronized boolean isConsumer(@OriginalArg(0) ImageConsumer consumer) {
+		return this.imageConsumer == consumer;
 	}
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IILjava/awt/Graphics;I)V")
 	@Override
-	public final void draw(@OriginalArg(2) Graphics arg0) {
-		this.method1170();
-		arg0.drawImage(this.image, 0, 0, this);
+	public final void draw(@OriginalArg(2) Graphics graphics) {
+		this.setPixels();
+		graphics.drawImage(this.image, 0, 0, this);
 	}
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IZILjava/awt/Component;)V")
 	@Override
-	public final void init(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) {
-		this.height = arg0;
-		this.pixels = new int[arg1 * arg0 + 1];
-		this.width = arg1;
-		this.aColorModel1 = new DirectColorModel(32, 16711680, 65280, 255);
-		this.image = arg2.createImage(this);
-		this.method1170();
-		arg2.prepareImage(this.image, this);
-		this.method1170();
-		arg2.prepareImage(this.image, this);
-		this.method1170();
-		arg2.prepareImage(this.image, this);
+	public final void init(@OriginalArg(0) int height, @OriginalArg(2) int width, @OriginalArg(3) Component component) {
+		this.height = height;
+		this.pixels = new int[width * height + 1];
+		this.width = width;
+		this.colorModel = new DirectColorModel(32, 16711680, 65280, 255);
+		this.image = component.createImage(this);
+		this.setPixels();
+		component.prepareImage(this.image, this);
+		this.setPixels();
+		component.prepareImage(this.image, this);
+		this.setPixels();
+		component.prepareImage(this.image, this);
 		this.makeTarget();
 	}
 
 	@OriginalMember(owner = "client!di", name = "imageUpdate", descriptor = "(Ljava/awt/Image;IIIII)Z")
 	@Override
-	public final boolean imageUpdate(@OriginalArg(0) Image arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+	public final boolean imageUpdate(@OriginalArg(0) Image image, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
 		return true;
 	}
 
 	@OriginalMember(owner = "client!di", name = "requestTopDownLeftRightResend", descriptor = "(Ljava/awt/image/ImageConsumer;)V")
 	@Override
-	public final void requestTopDownLeftRightResend(@OriginalArg(0) ImageConsumer arg0) {
+	public final void requestTopDownLeftRightResend(@OriginalArg(0) ImageConsumer consumer) {
 	}
 }

client/src/main/java/Js5.java

@@ -32,7 +32,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(B)Z")
-	public final boolean method4475() {
+	public final boolean fetchAll() {
 		if (!this.method4484()) {
 			return false;
 		}
@@ -59,7 +59,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(IZZ)V")
-	public final void method4477(@OriginalArg(1) boolean arg0) {
+	public final void discardNames(@OriginalArg(1) boolean arg0) {
 		if (!this.method4484()) {
 			return;
 		}
@@ -103,7 +103,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(Lclient!na;B)I")
-	public final int method4482(@OriginalArg(0) JagString arg0) {
+	public final int getGroupId(@OriginalArg(0) JagString arg0) {
 		if (this.method4484()) {
 			@Pc(16) JagString local16 = arg0.toLowerCase();
 			@Pc(27) int local27 = this.aClass70_2.aClass76_1.method2405(local16.method3154());
@@ -132,7 +132,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(ILclient!na;Lclient!na;)[B")
-	public final byte[] method4485(@OriginalArg(1) JagString arg0, @OriginalArg(2) JagString arg1) {
+	public final byte[] fetchFile(@OriginalArg(1) JagString arg0, @OriginalArg(2) JagString arg1) {
 		if (!this.method4484()) {
 			return null;
 		}
@@ -157,7 +157,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(Lclient!na;BLclient!na;)Z")
-	public final boolean method4487(@OriginalArg(0) JagString arg0, @OriginalArg(2) JagString arg1) {
+	public final boolean isFileReady(@OriginalArg(0) JagString arg0, @OriginalArg(2) JagString arg1) {
 		if (!this.method4484()) {
 			return false;
 		}
@@ -385,7 +385,7 @@ public final class Js5 {
 	}
 
 	@OriginalMember(owner = "client!ve", name = "c", descriptor = "(B)I")
-	public final int method4498() {
+	public final int getPercentageComplete() {
 		if (!this.method4484()) {
 			return 0;
 		}

client/src/main/java/Js5CachedResourceProvider.java

@@ -446,7 +446,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 	}
 
 	@OriginalMember(owner = "client!bg", name = "f", descriptor = "(I)I")
-	public final int method538() {
+	public final int getIndexPercentageComplete() {
 		if (this.method521() == null) {
 			return this.aClass3_Sub2_Sub5_1 == null ? 0 : this.aClass3_Sub2_Sub5_1.method3553();
 		} else {

client/src/main/java/MidiPcmStream.java

@@ -183,7 +183,7 @@ public final class MidiPcmStream extends PcmStream {
 	}
 
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(BII)V")
-	public final synchronized void method4420() {
+	public final synchronized void init() {
 		this.method4413();
 	}
 

client/src/main/java/Player.java

@@ -345,10 +345,10 @@ public final class Player extends PathingEntity {
 	public final JagString method1264() {
 		@Pc(2) JagString local2 = this.aClass100_364;
 		if (Static103.aClass100Array88 != null) {
-			local2 = Static34.method882(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 });
+			local2 = Static34.concatenate(new JagString[] { Static103.aClass100Array88[this.anInt1651], local2 });
 		}
 		if (Static263.aClass100Array174 != null) {
-			local2 = Static34.method882(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] });
+			local2 = Static34.concatenate(new JagString[] { local2, Static263.aClass100Array174[this.anInt1651] });
 		}
 		return local2;
 	}

client/src/main/java/Static1.java

@@ -11,7 +11,7 @@ public final class Static1 {
 	public static int anInt5;
 
 	@OriginalMember(owner = "client!a", name = "e", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1 = Static28.parse("scape main");
+	public static final JagString TITLE_SONG = Static28.parse("scape main");
 
 	@OriginalMember(owner = "client!a", name = "f", descriptor = "[Z")
 	public static final boolean[] aBooleanArray1 = new boolean[8];

client/src/main/java/Static102.java

@@ -18,7 +18,7 @@ public final class Static102 {
 	public static JagString aClass100_545 = null;
 
 	@OriginalMember(owner = "client!hn", name = "X", descriptor = "I")
-	public static int anInt2679 = 0;
+	public static int windowMode = 0;
 
 	@OriginalMember(owner = "client!hn", name = "Y", descriptor = "I")
 	public static int anInt2680 = 0;
@@ -52,12 +52,12 @@ public final class Static102 {
 	}
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V")
-	public static void method2074(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
+	public static void load(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) {
 		Static114.aClass3_Sub2_Sub9_42 = Static127.method2462(Static166.anInt4049, arg1, arg0);
 		if (GlRenderer.enabled) {
-			Static265.aClass3_Sub2_Sub9_Sub1_2 = Static122.method2412(Static166.anInt4049, arg0, arg1);
+			Static265.p11FullSoftware = Static122.method2412(Static166.anInt4049, arg0, arg1);
 		} else {
-			Static265.aClass3_Sub2_Sub9_Sub1_2 = (SoftwareFont) Static114.aClass3_Sub2_Sub9_42;
+			Static265.p11FullSoftware = (SoftwareFont) Static114.aClass3_Sub2_Sub9_42;
 		}
 		Static215.aClass3_Sub2_Sub9_32 = Static127.method2462(Static130.anInt3161, arg1, arg0);
 		Static280.aClass3_Sub2_Sub9_43 = Static127.method2462(Static73.anInt2077, arg1, arg0);

client/src/main/java/Static103.java

@@ -177,7 +177,7 @@ public final class Static103 {
 				Static6.outboundBuffer.p1isaac(92);
 				Static6.outboundBuffer.p2leadd(local36);
 			} else {
-				method2231(Static186.aClass100_827, 0, Static34.method882(new JagString[] { Static123.method2423(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
+				method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
 			}
 			Static72.anInt2043 = 0;
 			Static257.aClass13_7 = Static5.getComponent(local19);
@@ -349,9 +349,9 @@ public final class Static103 {
 					Static102.aClass100_545 = Static250.aClass100_1042;
 				}
 				if (local693.aBoolean32) {
-					Static78.aClass100_466 = Static34.method882(new JagString[] { local693.aClass100_88, Static204.aClass100_896 });
+					Static78.aClass100_466 = Static34.concatenate(new JagString[] { local693.aClass100_88, Static204.aClass100_896 });
 				} else {
-					Static78.aClass100_466 = Static34.method882(new JagString[] { Static42.aClass100_332, local693.aClass100_85, Static204.aClass100_896 });
+					Static78.aClass100_466 = Static34.concatenate(new JagString[] { Static42.aClass100_332, local693.aClass100_85, Static204.aClass100_896 });
 				}
 			}
 			return;
@@ -595,7 +595,7 @@ public final class Static103 {
 			Static260.anInt5014 = 1;
 			Static274.anInt4997 = local36;
 			Static43.method1143(local693);
-			Static34.aClass100_203 = Static34.method882(new JagString[] { Static8.aClass100_32, Static71.method1439(local36).aClass100_495, Static204.aClass100_896 });
+			Static34.aClass100_203 = Static34.concatenate(new JagString[] { Static8.aClass100_32, Static71.method1439(local36).aClass100_495, Static204.aClass100_896 });
 			if (Static34.aClass100_203 == null) {
 				Static34.aClass100_203 = Static92.aClass100_510;
 			}

client/src/main/java/Static104.java

@@ -234,7 +234,7 @@ public final class Static104 {
 	}
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(I)I")
-	public static int method2252() {
+	public static int getTotal() {
 		return 2;
 	}
 }

client/src/main/java/Static107.java

@@ -1,7 +1,5 @@
-import java.awt.Component;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static107 {
 
@@ -27,71 +25,18 @@ public final class Static107 {
 	public static final int[] anIntArray259 = new int[14];
 
 	@OriginalMember(owner = "client!id", name = "f", descriptor = "Z")
-	public static boolean aBoolean147 = false;
+	public static boolean clean = false;
 
 	@OriginalMember(owner = "client!id", name = "j", descriptor = "Lclient!of;")
 	public static QuickChatCommandDecoder anInterface3_1 = null;
 
 	@OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V")
 	public static void method2261() {
-		if (Static147.aClass62_2 != null) {
-			Static147.aClass62_2.method3565();
+		if (Static147.soundChannel != null) {
+			Static147.soundChannel.loop();
 		}
-		if (Static11.aClass62_1 != null) {
-			Static11.aClass62_1.method3565();
-		}
-	}
-
-	@OriginalMember(owner = "client!id", name = "a", descriptor = "(ILsignlink!ll;Ljava/awt/Component;II)Lclient!vh;")
-	public static AudioChannel method2262(@OriginalArg(0) int arg0, @OriginalArg(1) SignLink arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
-		if (Static44.sampleRate == 0) {
-			throw new IllegalStateException();
-		}
-		try {
-			@Pc(33) AudioChannel local33 = (AudioChannel) Class.forName("JavaAudioChannel").getDeclaredConstructor().newInstance();
-			local33.anInt4641 = arg0;
-			local33.anIntArray411 = new int[(AudioChannel.stereo ? 2 : 1) * 256];
-			local33.init(arg2);
-			local33.anInt4644 = (arg0 & -1024) + 1024;
-			if (local33.anInt4644 > 16384) {
-				local33.anInt4644 = 16384;
-			}
-			local33.open(local33.anInt4644);
-			if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
-				Static60.aClass19_1 = new AudioThread();
-				Static60.aClass19_1.aClass213_1 = arg1;
-				arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
-			}
-			if (Static60.aClass19_1 != null) {
-				if (Static60.aClass19_1.aClass62Array1[arg3] != null) {
-					throw new IllegalArgumentException();
-				}
-				Static60.aClass19_1.aClass62Array1[arg3] = local33;
-			}
-			return local33;
-		} catch (@Pc(109) Throwable local109) {
-			try {
-				@Pc(120) SignLinkAudioChannel local120 = new SignLinkAudioChannel(arg1, arg3);
-				local120.anIntArray411 = new int[(AudioChannel.stereo ? 2 : 1) * 256];
-				local120.anInt4641 = arg0;
-				local120.init(arg2);
-				local120.anInt4644 = 16384;
-				local120.open(local120.anInt4644);
-				if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
-					Static60.aClass19_1 = new AudioThread();
-					Static60.aClass19_1.aClass213_1 = arg1;
-					arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
-				}
-				if (Static60.aClass19_1 != null) {
-					if (Static60.aClass19_1.aClass62Array1[arg3] != null) {
-						throw new IllegalArgumentException();
-					}
-					Static60.aClass19_1.aClass62Array1[arg3] = local120;
-				}
-				return local120;
-			} catch (@Pc(186) Throwable local186) {
-				return new AudioChannel();
-			}
+		if (Static11.musicChannel != null) {
+			Static11.musicChannel.loop();
 		}
 	}
 
@@ -104,7 +49,7 @@ public final class Static107 {
 	}
 
 	@OriginalMember(owner = "client!id", name = "a", descriptor = "(Lclient!ve;B)V")
-	public static void method2264(@OriginalArg(0) Js5 arg0) {
+	public static void init(@OriginalArg(0) Js5 arg0) {
 		Static85.aClass153_36 = arg0;
 	}
 }

client/src/main/java/Static11.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static11 {
 
 	@OriginalMember(owner = "client!ba", name = "D", descriptor = "Lclient!vh;")
-	public static AudioChannel aClass62_1;
+	public static AudioChannel musicChannel;
 
 	@OriginalMember(owner = "client!ba", name = "w", descriptor = "I")
 	public static int anInt384 = 0;

client/src/main/java/Static110.java

@@ -62,7 +62,7 @@ public final class Static110 {
 				local141 = Static112.method2299(local6.aClass8_Sub4_Sub2_1);
 				if (local141 != local6.anInt2044) {
 					if (local6.aClass3_Sub3_Sub1_1 != null) {
-						Static204.aClass3_Sub3_Sub2_1.method1347(local6.aClass3_Sub3_Sub1_1);
+						Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
 						local6.aClass3_Sub3_Sub1_1 = null;
 					}
 					local6.anInt2044 = local141;
@@ -89,7 +89,7 @@ public final class Static110 {
 				local141 = Static140.method2706(local6.aClass8_Sub4_Sub1_1);
 				if (local6.anInt2044 != local141) {
 					if (local6.aClass3_Sub3_Sub1_1 != null) {
-						Static204.aClass3_Sub3_Sub2_1.method1347(local6.aClass3_Sub3_Sub1_1);
+						Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
 						local6.aClass3_Sub3_Sub1_1 = null;
 					}
 					local6.anInt2044 = local141;

client/src/main/java/Static112.java

@@ -14,9 +14,9 @@ public final class Static112 {
 		@Pc(11) int local11 = Static13.anInt436;
 		@Pc(13) int local13 = Static24.anInt761;
 		if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
-			if (Static209.aClass153_86.method4506(Static55.anInt1736) && Static209.aClass153_86.method4506(Static169.anInt4073)) {
-				Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.aClass153_86, Static55.anInt1736);
-				Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.aClass153_86, Static169.anInt4073);
+			if (Static209.js5Archive8.method4506(Static55.anInt1736) && Static209.js5Archive8.method4506(Static169.anInt4073)) {
+				Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.js5Archive8, Static55.anInt1736);
+				Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.js5Archive8, Static169.anInt4073);
 				if (GlRenderer.enabled) {
 					if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
 						Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@@ -65,10 +65,10 @@ public final class Static112 {
 				}
 			}
 		}
-		if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.aClass153_86.method4506(Static85.anInt2261) && Static209.aClass153_86.method4506(Static136.anInt3324) && Static209.aClass153_86.method4506(Static254.anInt5556)) {
-			Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.aClass153_86, Static85.anInt2261);
-			Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.aClass153_86, Static136.anInt3324);
-			Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.aClass153_86, Static254.anInt5556);
+		if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.method4506(Static85.anInt2261) && Static209.js5Archive8.method4506(Static136.anInt3324) && Static209.js5Archive8.method4506(Static254.anInt5556)) {
+			Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.js5Archive8, Static85.anInt2261);
+			Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.js5Archive8, Static136.anInt3324);
+			Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.js5Archive8, Static254.anInt5556);
 			if (GlRenderer.enabled) {
 				if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
 					Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);

client/src/main/java/Static113.java

@@ -8,7 +8,7 @@ public final class Static113 {
 	public static int anInt4612;
 
 	@OriginalMember(owner = "client!il", name = "I", descriptor = "I")
-	public static int anInt4609 = 3;
+	public static int brightness = 3;
 
 	@OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
 	public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {

client/src/main/java/Static115.java

@@ -66,7 +66,7 @@ public final class Static115 {
 	}
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V")
-	public static void method2311(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
+	public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
 		Static87.aClass153_38 = arg1;
 		Static29.aClass153_19 = arg0;
 	}
@@ -146,7 +146,7 @@ public final class Static115 {
 		Static213.aClass3_Sub2_Sub1Array8 = null;
 		Static240.aClass3_Sub2_Sub1Array10 = null;
 		Static159.aClass36Array12 = null;
-		Static265.aClass3_Sub2_Sub9_Sub1_2 = null;
+		Static265.p11FullSoftware = null;
 		Static173.aClass3_Sub2_Sub1_Sub1Array9 = null;
 		Static67.aClass3_Sub2_Sub1Array4 = null;
 		Static149.aClass3_Sub2_Sub1Array7 = null;

client/src/main/java/Static119.java

@@ -59,7 +59,7 @@ public final class Static119 {
 	}
 
 	@OriginalMember(owner = "client!je", name = "a", descriptor = "(ILclient!ve;)V")
-	public static void method2384(@OriginalArg(1) Js5 arg0) {
+	public static void init(@OriginalArg(1) Js5 arg0) {
 		Static9.aClass153_2 = arg0;
 	}
 

client/src/main/java/Static122.java

@@ -8,7 +8,7 @@ public final class Static122 {
 	public static Class12 aClass12_1;
 
 	@OriginalMember(owner = "client!jh", name = "p", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_46;
+	public static Js5 js5Archive21;
 
 	@OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;")
 	public static final JagString[] aClass100Array92 = new JagString[200];

client/src/main/java/Static123.java

@@ -214,7 +214,7 @@ public final class Static123 {
 	}
 
 	@OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;")
-	public static JagString method2423(@OriginalArg(1) int arg0) {
+	public static JagString parseInt(@OriginalArg(1) int arg0) {
 		return Static198.method1025(false, arg0);
 	}
 }

client/src/main/java/Static125.java

@@ -23,7 +23,7 @@ public final class Static125 {
 	public static int anInt3104 = 127;
 
 	@OriginalMember(owner = "client!jl", name = "a", descriptor = "(ILclient!ve;Lclient!ve;)V")
-	public static void method2446(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
+	public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
 		Static14.aClass153_8 = arg0;
 		Static216.aClass153_31 = arg1;
 		Static53.anInt1716 = Static216.aClass153_31.method4504(3);

client/src/main/java/Static126.java

@@ -13,7 +13,7 @@ public final class Static126 {
 	private static final JagString aClass100_603 = Static28.parse("");
 
 	@OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;")
-	public static JagString aClass100_602 = aClass100_603;
+	public static JagString mainLoadSecondaryText = aClass100_603;
 
 	@OriginalMember(owner = "client!jm", name = "a", descriptor = "(Z)V")
 	public static void method2460() {

client/src/main/java/Static127.java

@@ -184,7 +184,7 @@ 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.aClass100_352) == -1) {
+		if (arg1.indexOf(Static49.PERCENT_SIGN) == -1) {
 			return arg1;
 		}
 		while (true) {
@@ -207,7 +207,7 @@ public final class Static127 {
 													if (local14 == -1) {
 														return arg1;
 													}
-													@Pc(246) JagString local246 = Static186.aClass100_827;
+													@Pc(246) JagString local246 = Static186.EMPTY_FILE;
 													if (Static232.aClass212_5 != null) {
 														local246 = Static181.method3341(Static232.aClass212_5.intArg2);
 														try {
@@ -218,22 +218,22 @@ public final class Static127 {
 														} catch (@Pc(274) UnsupportedEncodingException local274) {
 														}
 													}
-													arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), local246, arg1.method3136(local14 + 4) });
+													arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.method3136(local14 + 4) });
 												}
 											}
-											arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.method3136(local14 + 2) });
+											arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.method3136(local14 + 2) });
 										}
 									}
-									arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.method3136(local14 + 2) });
+									arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.method3136(local14 + 2) });
 								}
 							}
-							arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.method3136(local14 + 2) });
+							arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.method3136(local14 + 2) });
 						}
 					}
-					arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.method3136(local14 + 2) });
+					arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.method3136(local14 + 2) });
 				}
 			}
-			arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.method3136(local14 + 2) });
+			arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.method3136(local14 + 2) });
 		}
 	}
 
@@ -250,7 +250,7 @@ public final class Static127 {
 				}
 				local29 = Runtime.getRuntime();
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-				Static103.method2231(null, 0, Static34.method882(new JagString[] { Static202.aClass100_892, Static123.method2423(local38), Static17.aClass100_101 }));
+				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), Static17.aClass100_101 }));
 			}
 			@Pc(117) int local117;
 			if (arg0.method3111(Static154.aClass100_735)) {
@@ -260,17 +260,17 @@ public final class Static127 {
 				}
 				local29 = Runtime.getRuntime();
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-				Static103.method2231(null, 0, Static34.method882(new JagString[] { Static203.aClass100_893, Static123.method2423(local38), Static17.aClass100_101 }));
+				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), Static17.aClass100_101 }));
 				Static16.method501();
 				Static119.method2380();
 				for (local117 = 0; local117 < 10; local117++) {
 					System.gc();
 				}
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-				Static103.method2231(null, 0, Static34.method882(new JagString[] { Static270.aClass100_1093, Static123.method2423(local38), Static17.aClass100_101 }));
+				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static270.aClass100_1093, Static123.parseInt(local38), Static17.aClass100_101 }));
 			}
 			if (arg0.method3111(Static240.aClass100_1009)) {
-				Static103.method2231(null, 0, Static34.method882(new JagString[] { Static44.aClass100_335, Static123.method2423(Static198.method1029()) }));
+				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) }));
 			}
 			if (GlRenderer.enabled && arg0.method3111(Static201.aClass100_406)) {
 				System.out.println("oncard_geometry:" + Static63.anInt1945);
@@ -304,29 +304,29 @@ public final class Static127 {
 				Static43.displayFps = false;
 			}
 			if (arg0.method3111(Static96.aClass100_522)) {
-				Static241.method4540(false, 0, -1, -1);
+				Static241.setWindowMode(false, 0, -1, -1);
 			}
 			if (arg0.method3111(Static181.aClass100_811)) {
-				Static241.method4540(false, 1, -1, -1);
+				Static241.setWindowMode(false, 1, -1, -1);
 			}
 			if (arg0.method3111(Static207.aClass100_904)) {
-				Static241.method4540(false, 2, -1, -1);
+				Static241.setWindowMode(false, 2, -1, -1);
 			}
 			if (arg0.method3111(Static99.aClass100_529)) {
-				Static241.method4540(false, 3, 1024, 768);
+				Static241.setWindowMode(false, 3, 1024, 768);
 			}
 			if (arg0.method3111(Static69.aClass100_443)) {
 				for (local18 = 0; local18 < 4; local18++) {
 					for (local38 = 1; local38 < 103; local38++) {
 						for (local117 = 1; local117 < 103; local117++) {
-							Static148.aClass97Array1[local18].anIntArrayArray30[local38][local117] = 0;
+							Static148.collisionMaps[local18].anIntArrayArray30[local38][local117] = 0;
 						}
 					}
 				}
 			}
 			if (arg0.method3138(Static241.aClass100_1088)) {
 				Static76.method1645(arg0.method3136(15).parseInt());
-				Static203.method3663(GameShell.signLink);
+				Static203.write(GameShell.signLink);
 				Static18.sentToServer = false;
 			}
 			if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
@@ -337,7 +337,7 @@ public final class Static127 {
 			}
 			if (arg0.method3138(Static211.aClass100_232)) {
 				Static199.anInt4672 = arg0.method3136(12).method3144().parseInt();
-				Static103.method2231(null, 0, Static34.method882(new JagString[] { Static276.aClass100_1096, Static123.method2423(Static199.anInt4672) }));
+				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.anInt4672) }));
 			}
 			if (arg0.method3111(Static181.aClass100_810)) {
 				Static121.aBoolean154 = true;

client/src/main/java/Static13.java

@@ -27,16 +27,16 @@ public final class Static13 {
 	public static JagString method471() {
 		@Pc(32) JagString local32;
 		if (Static260.anInt5014 == 1 && Static231.anInt5204 < 2) {
-			local32 = Static34.method882(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 });
+			local32 = Static34.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 });
 		} else if (Static241.aBoolean302 && Static231.anInt5204 < 2) {
-			local32 = Static34.method882(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
+			local32 = Static34.concatenate(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
 		} else if (Static172.shiftClick && Static187.pressedKeys[81] && Static231.anInt5204 > 2) {
 			local32 = Static269.method2228(Static231.anInt5204 - 2);
 		} else {
 			local32 = Static269.method2228(Static231.anInt5204 - 1);
 		}
 		if (Static231.anInt5204 > 2) {
-			local32 = Static34.method882(new JagString[] { local32, Static1.aClass100_2, Static123.method2423(Static231.anInt5204 - 2), LocalizedText.MOREOPTIONS});
+			local32 = Static34.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(Static231.anInt5204 - 2), LocalizedText.MOREOPTIONS});
 		}
 		return local32;
 	}

client/src/main/java/Static130.java

@@ -16,7 +16,7 @@ public final class Static130 {
 	public static int anInt3161;
 
 	@OriginalMember(owner = "client!kc", name = "w", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_47;
+	public static Js5 js5Archive6;
 
 	@OriginalMember(owner = "client!kc", name = "C", descriptor = "Lclient!fd;")
 	public static WorldMapFont aClass41_2;

client/src/main/java/Static136.java

@@ -75,16 +75,16 @@ public final class Static136 {
 		if (arg0.data.length - arg0.offset < local34) {
 			return;
 		}
-		Static113.anInt4609 = arg0.g1();
-		if (Static113.anInt4609 < 1) {
-			Static113.anInt4609 = 1;
-		} else if (Static113.anInt4609 > 4) {
-			Static113.anInt4609 = 4;
+		Static113.brightness = arg0.g1();
+		if (Static113.brightness < 1) {
+			Static113.brightness = 1;
+		} else if (Static113.brightness > 4) {
+			Static113.brightness = 4;
 		}
 		Static53.method1293(arg0.g1() == 1);
 		Static80.aBoolean231 = arg0.g1() == 1;
 		Static250.aBoolean283 = arg0.g1() == 1;
-		Static53.aBoolean99 = arg0.g1() == 1;
+		Static53.highDetailTextures = arg0.g1() == 1;
 		Static15.aBoolean33 = arg0.g1() == 1;
 		Static11.aBoolean15 = arg0.g1() == 1;
 		Static159.aBoolean189 = arg0.g1() == 1;
@@ -101,12 +101,12 @@ public final class Static136 {
 		}
 		Static220.aBoolean244 = arg0.g1() == 1;
 		Static71.aBoolean107 = arg0.g1() == 1;
-		Static102.anInt2679 = arg0.g1();
-		if (Static102.anInt2679 > 2) {
-			Static102.anInt2679 = 2;
+		Static102.windowMode = arg0.g1();
+		if (Static102.windowMode > 2) {
+			Static102.windowMode = 2;
 		}
-		Static186.anInt4392 = Static102.anInt2679;
-		Static99.aBoolean143 = arg0.g1() == 1;
+		Static186.antiAliasingMode = Static102.windowMode;
+		Static99.stereo = arg0.g1() == 1;
 		Static125.anInt3104 = arg0.g1();
 		if (Static125.anInt3104 > 127) {
 			Static125.anInt3104 = 127;
@@ -134,16 +134,16 @@ public final class Static136 {
 			Static164.anInt3988 = arg0.g4();
 		}
 		if (local21 >= 6) {
-			Static214.anInt5581 = arg0.g1();
+			Static214.windowMode = arg0.g1();
 		}
 		if (local21 >= 7) {
-			Static164.aBoolean191 = arg0.g1() == 1;
+			Static164.safeMode = arg0.g1() == 1;
 		}
 		if (local21 >= 8) {
 			Static33.aBoolean63 = arg0.g1() == 1;
 		}
 		if (local21 >= 9) {
-			Static141.anInt3474 = arg0.g1();
+			Static141.buildArea = arg0.g1();
 		}
 		if (local21 >= 10) {
 			Static127.aBoolean159 = arg0.g1() != 0;

client/src/main/java/Static137.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static137 {
 
 	@OriginalMember(owner = "client!kl", name = "r", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_49;
+	public static Js5 js5Archive14;
 
 	@OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
 	public static int anInt3337 = 0;
@@ -70,7 +70,7 @@ public final class Static137 {
 							@Pc(237) int local237 = local76;
 							local194 = local37;
 							if (local187 != 22 && local187 != 29 && local187 != 34 && local187 != 36 && local187 != 46 && local187 != 47 && local187 != 48) {
-								@Pc(269) int[][] local269 = Static148.aClass97Array1[Static55.level].anIntArrayArray30;
+								@Pc(269) int[][] local269 = Static148.collisionMaps[Static55.level].anIntArrayArray30;
 								for (@Pc(271) int local271 = 0; local271 < 10; local271++) {
 									@Pc(281) int local281 = (int) (Math.random() * 4.0D);
 									if (local281 == 0 && local194 > 0 && local37 - 3 < local194 && (local269[local194 - 1][local237] & 0x12C0108) == 0) {

client/src/main/java/Static138.java

@@ -11,10 +11,10 @@ public final class Static138 {
 	public static float aFloat14;
 
 	@OriginalMember(owner = "client!km", name = "Nc", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_50;
+	public static Js5 js5Archive17;
 
 	@OriginalMember(owner = "client!km", name = "Oc", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_51;
+	public static Js5 js5Archive15;
 
 	@OriginalMember(owner = "client!km", name = "Pc", descriptor = "I")
 	public static int anInt3439;
@@ -68,7 +68,7 @@ public final class Static138 {
 	public static final int[] updatedVarcs = new int[32];
 
 	@OriginalMember(owner = "client!km", name = "Mc", descriptor = "Lclient!na;")
-	public static final JagString aClass100_652 = Static28.parse("loginscreen");
+	public static final JagString LOGINSCREEN = Static28.parse("loginscreen");
 
 	@OriginalMember(owner = "client!km", name = "Rc", descriptor = "[I")
 	public static final int[] anIntArray324 = new int[] { 19, 55, 38, 155, 255, 110, 137, 205, 76 };
@@ -96,7 +96,7 @@ public final class Static138 {
 			return arg1 ? Static23.method648(local14) : local14;
 		} else if (arg0 instanceof ByteArray) {
 			@Pc(34) ByteArray local34 = (ByteArray) arg0;
-			return local34.method4236();
+			return local34.get();
 		} else {
 			throw new IllegalArgumentException();
 		}

client/src/main/java/Static140.java

@@ -53,25 +53,25 @@ public final class Static140 {
 			return;
 		}
 		if (Static35.anInt1093 >= 100) {
-			Static103.method2231(Static186.aClass100_827, 0, LocalizedText.IGNORELISTFULL);
+			Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORELISTFULL);
 			return;
 		}
 		@Pc(34) JagString local34 = Static79.decode37(arg0).method3125();
 		@Pc(36) int local36;
 		for (local36 = 0; local36 < Static35.anInt1093; local36++) {
 			if (Static190.aLongArray6[local36] == arg0) {
-				Static103.method2231(Static186.aClass100_827, 0, Static34.method882(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
+				Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
 				return;
 			}
 		}
 		for (local36 = 0; local36 < Static9.anInt178; local36++) {
 			if (Static92.aLongArray3[local36] == arg0) {
-				Static103.method2231(Static186.aClass100_827, 0, Static34.method882(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
+				Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
 				return;
 			}
 		}
 		if (local34.method3108(Static173.self.aClass100_364)) {
-			Static103.method2231(Static186.aClass100_827, 0, LocalizedText.IGNORECANTADDSELF);
+			Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORECANTADDSELF);
 			return;
 		}
 		Static190.aLongArray6[Static35.anInt1093] = arg0;
@@ -98,7 +98,7 @@ public final class Static140 {
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!na;Lclient!ve;)Lclient!se;")
 	public static Class134 method2711(@OriginalArg(1) JagString arg0, @OriginalArg(2) Js5 arg1) {
-		@Pc(10) int local10 = arg1.method4482(arg0);
+		@Pc(10) int local10 = arg1.getGroupId(arg0);
 		if (local10 == -1) {
 			return new Class134(0);
 		}

client/src/main/java/Static141.java

@@ -20,7 +20,7 @@ public final class Static141 {
 	public static int anInt3470 = 0;
 
 	@OriginalMember(owner = "client!lb", name = "A", descriptor = "I")
-	public static int anInt3474 = 0;
+	public static int buildArea = 0;
 
 	@OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V")
 	public static void method2720() {
@@ -56,15 +56,15 @@ public final class Static141 {
 			Static242.method4201();
 			Static76.method1642();
 		}
-		Static102.method2074(Static261.aClass153_107, Static209.aClass153_86);
-		Static30.method839(Static209.aClass153_86);
+		Static102.load(Static261.js5Archive13, Static209.js5Archive8);
+		Static30.load(Static209.js5Archive8);
 		Static204.aClass3_Sub2_Sub1_10 = null;
 		Static39.aClass3_Sub2_Sub1_1 = null;
 		Static92.aClass3_Sub2_Sub1_6 = null;
 		Static165.aClass3_Sub2_Sub1_8 = null;
 		Static181.aClass3_Sub2_Sub1_9 = null;
 		if (Static244.anInt5370 == 5) {
-			Static181.method3344(Static209.aClass153_86);
+			Static181.method3344(Static209.js5Archive8);
 		}
 		if (Static244.anInt5370 == 10) {
 			Static73.method1596(false);
@@ -90,7 +90,7 @@ public final class Static141 {
 	}
 
 	@OriginalMember(owner = "client!lb", name = "a", descriptor = "(Lclient!ve;Lclient!ve;ILclient!ve;)V")
-	public static void method2724(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) Js5 arg2) {
+	public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(3) Js5 arg2) {
 		Static243.aClass153_98 = arg1;
 		Static5.aClass153_1 = arg0;
 		Static225.aClass153_92 = arg2;

client/src/main/java/Static142.java

@@ -128,7 +128,7 @@ public final class Static142 {
 						@Pc(518) Npc local518 = (Npc) local17;
 						@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.method3106((long) local518.aClass96_1.anInt3736);
 						if (local528 == null) {
-							local528 = Static209.method3708(local518.aClass96_1.anInt3736, Static209.aClass153_86);
+							local528 = Static209.method3708(local518.aClass96_1.anInt3736, Static209.js5Archive8);
 							if (local528 != null) {
 								Static73.aClass99_10.method3095(local528, (long) local518.aClass96_1.anInt3736);
 							}
@@ -193,7 +193,7 @@ public final class Static142 {
 								Static65.anInt1951 += 15;
 							}
 							Static213.aClass3_Sub2_Sub1Array8[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12);
-							Static114.aClass3_Sub2_Sub9_42.method2875(Static123.method2423(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
+							Static114.aClass3_Sub2_Sub9_42.method2875(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
 						}
 					}
 				}

client/src/main/java/Static143.java

@@ -34,7 +34,7 @@ public final class Static143 {
 	}
 
 	@OriginalMember(owner = "client!ld", name = "a", descriptor = "(B)I")
-	public static int method2732() {
+	public static int getTotal() {
 		return 6;
 	}
 

client/src/main/java/Static145.java

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

client/src/main/java/Static147.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static147 {
 
 	@OriginalMember(owner = "client!lh", name = "s", descriptor = "Lclient!vh;")
-	public static AudioChannel aClass62_2;
+	public static AudioChannel soundChannel;
 
 	@OriginalMember(owner = "client!lh", name = "u", descriptor = "I")
 	public static volatile int anInt3521 = -1;

client/src/main/java/Static148.java

@@ -11,7 +11,7 @@ public final class Static148 {
 	public static int anInt3534;
 
 	@OriginalMember(owner = "client!li", name = "v", descriptor = "Lclient!va;")
-	public static MidiPcmStream aClass3_Sub3_Sub4_1;
+	public static MidiPcmStream musicStream;
 
 	@OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;")
 	public static HashTable aClass133_13;
@@ -20,7 +20,7 @@ public final class Static148 {
 	public static int screenUpperY;
 
 	@OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;")
-	public static final CollisionMap[] aClass97Array1 = new CollisionMap[4];
+	public static final CollisionMap[] collisionMaps = new CollisionMap[4];
 
 	@OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;")
 	public static final JagString aClass100_677 = Static28.parse("::rebuild");
@@ -30,7 +30,7 @@ public final class Static148 {
 		if (arg0 == -1 && !Static144.aBoolean173) {
 			Static241.method4548();
 		} else if (arg0 != -1 && (Static221.anInt4363 != arg0 || !Static136.method2655()) && Static12.anInt391 != 0 && !Static144.aBoolean173) {
-			Static257.method526(arg0, Static130.aClass153_47, Static12.anInt391);
+			Static257.method526(arg0, Static130.js5Archive6, Static12.anInt391);
 		}
 		Static221.anInt4363 = arg0;
 	}
@@ -53,7 +53,7 @@ public final class Static148 {
 		if (local16 != null) {
 			return local16;
 		}
-		@Pc(26) byte[] local26 = Static261.aClass153_107.method4495(arg0, 0);
+		@Pc(26) byte[] local26 = Static261.js5Archive13.method4495(arg0, 0);
 		local16 = new SoftwareFont(local26);
 		local16.method2873(Static159.aClass36Array12, null);
 		Static139.aClass99_22.method3095(local16, (long) arg0);

client/src/main/java/Static15.java

@@ -25,14 +25,14 @@ public final class Static15 {
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
 	public static JagString method479() {
 		@Pc(8) JagString local8 = Static93.aClass100_518;
-		@Pc(10) JagString local10 = Static186.aClass100_827;
+		@Pc(10) JagString local10 = Static186.EMPTY_FILE;
 		if (Static83.modeWhere != 0) {
 			local8 = Static50.aClass100_365;
 		}
 		if (Static47.aClass100_991 != null) {
-			local10 = Static34.method882(new JagString[] { Static150.aClass100_687, Static47.aClass100_991 });
+			local10 = Static34.concatenate(new JagString[] { Static150.aClass100_687, Static47.aClass100_991 });
 		}
-		return Static34.method882(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.method2423(Static141.anInt3470), Static257.aClass100_98, Static123.method2423(Static204.anInt4760), local10, Static41.aClass100_268 });
+		return Static34.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(Static141.anInt3470), Static257.aClass100_98, Static123.parseInt(Static204.anInt4760), local10, Static41.aClass100_268 });
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")

client/src/main/java/Static150.java

@@ -17,7 +17,7 @@ public final class Static150 {
 	public static int clickButton = 0;
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!ve;)I")
-	public static int method2797(@OriginalArg(1) Js5 arg0) {
+	public static int getReady(@OriginalArg(1) Js5 arg0) {
 		@Pc(1) int local1 = 0;
 		if (arg0.method4506(Static262.anInt5754)) {
 			local1++;
@@ -111,11 +111,11 @@ public final class Static150 {
 		}
 		if (arg1.anInt2042 == 0 || arg1.anInt2042 < local20 - 64 || Static30.anInt978 == 0 || arg2 != arg1.anInt2033) {
 			if (arg1.aClass3_Sub3_Sub1_1 != null) {
-				Static204.aClass3_Sub3_Sub2_1.method1347(arg1.aClass3_Sub3_Sub1_1);
+				Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_1);
 				arg1.aClass3_Sub3_Sub1_1 = null;
 			}
 			if (arg1.aClass3_Sub3_Sub1_2 != null) {
-				Static204.aClass3_Sub3_Sub2_1.method1347(arg1.aClass3_Sub3_Sub1_2);
+				Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_2);
 				arg1.aClass3_Sub3_Sub1_2 = null;
 			}
 			return;
@@ -128,12 +128,12 @@ public final class Static150 {
 		if (arg1.aClass3_Sub3_Sub1_1 != null) {
 			arg1.aClass3_Sub3_Sub1_1.method386(local134);
 		} else if (arg1.anInt2044 >= 0) {
-			@Pc(150) SynthSound local150 = Static292.method3988(Static248.aClass153_75, arg1.anInt2044, 0);
+			@Pc(150) SynthSound local150 = Static292.method3988(Static248.js5Archive4, arg1.anInt2044, 0);
 			if (local150 != null) {
-				@Pc(158) PcmSound local158 = local150.method3989().method2648(Static56.aClass156_1);
+				@Pc(158) PcmSound local158 = local150.method3989().method2648(Static56.resampler);
 				@Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134);
 				local163.method396(-1);
-				Static204.aClass3_Sub3_Sub2_1.method1343(local163);
+				Static204.soundStream.method1343(local163);
 				arg1.aClass3_Sub3_Sub1_1 = local163;
 			}
 		}
@@ -144,12 +144,12 @@ public final class Static150 {
 			}
 		} else if (arg1.anIntArray181 != null && (arg1.anInt2034 -= arg3) <= 0) {
 			@Pc(219) int local219 = (int) ((double) arg1.anIntArray181.length * Math.random());
-			@Pc(227) SynthSound local227 = Static292.method3988(Static248.aClass153_75, arg1.anIntArray181[local219], 0);
+			@Pc(227) SynthSound local227 = Static292.method3988(Static248.js5Archive4, arg1.anIntArray181[local219], 0);
 			if (local227 != null) {
-				@Pc(236) PcmSound local236 = local227.method3989().method2648(Static56.aClass156_1);
+				@Pc(236) PcmSound local236 = local227.method3989().method2648(Static56.resampler);
 				@Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134);
 				local241.method396(0);
-				Static204.aClass3_Sub3_Sub2_1.method1343(local241);
+				Static204.soundStream.method1343(local241);
 				arg1.anInt2034 = (int) ((double) (arg1.anInt2040 - arg1.anInt2032) * Math.random()) + arg1.anInt2032;
 				arg1.aClass3_Sub3_Sub1_2 = local241;
 			}

client/src/main/java/Static156.java

@@ -9,10 +9,10 @@ public final class Static156 {
 	public static byte[][] aByteArrayArray11;
 
 	@OriginalMember(owner = "client!mf", name = "W", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_59;
+	public static Js5 js5Archive22;
 
 	@OriginalMember(owner = "client!mf", name = "X", descriptor = "I")
-	public static int anInt3783;
+	public static int loginScreenId;
 
 	@OriginalMember(owner = "client!mf", name = "x", descriptor = "Lclient!ha;")
 	public static final GzipDecompressor aClass56_1 = new GzipDecompressor();

client/src/main/java/Static158.java

@@ -60,18 +60,18 @@ public final class Static158 {
 				Static124.socket = new BufferedSocket((Socket) Static72.aClass212_3.result, GameShell.signLink);
 				Static72.aClass212_3 = null;
 				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
-				if (Static11.aClass62_1 != null) {
-					Static11.aClass62_1.method3571();
+				if (Static11.musicChannel != null) {
+					Static11.musicChannel.method3571();
 				}
-				if (Static147.aClass62_2 != null) {
-					Static147.aClass62_2.method3571();
+				if (Static147.soundChannel != null) {
+					Static147.soundChannel.method3571();
 				}
 				local120 = Static124.socket.read();
-				if (Static11.aClass62_1 != null) {
-					Static11.aClass62_1.method3571();
+				if (Static11.musicChannel != null) {
+					Static11.musicChannel.method3571();
 				}
-				if (Static147.aClass62_2 != null) {
-					Static147.aClass62_2.method3571();
+				if (Static147.soundChannel != null) {
+					Static147.soundChannel.method3571();
 				}
 				if (local120 != 21) {
 					Static223.anInt5034 = local120;

client/src/main/java/Static16.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static16 {
 
 	@OriginalMember(owner = "client!bf", name = "s", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_9;
+	public static Js5 js5Archive12;
 
 	@OriginalMember(owner = "client!bf", name = "B", descriptor = "I")
 	public static int anInt548 = -1;

client/src/main/java/Static160.java

@@ -23,7 +23,7 @@ public final class Static160 {
 	public static int anInt3902 = 0;
 
 	@OriginalMember(owner = "client!mj", name = "A", descriptor = "J")
-	public static long aLong134 = 0L;
+	public static long prevGc = 0L;
 
 	@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) {

client/src/main/java/Static164.java

@@ -8,7 +8,7 @@ public final class Static164 {
 	public static boolean newTab;
 
 	@OriginalMember(owner = "client!na", name = "h", descriptor = "Z")
-	public static boolean aBoolean191 = false;
+	public static boolean safeMode = false;
 
 	@OriginalMember(owner = "client!na", name = "l", descriptor = "I")
 	public static int anInt3985 = 0;

client/src/main/java/Static165.java

@@ -32,7 +32,7 @@ public final class Static165 {
 	public static final JagString aClass100_776 = Static28.parse("logo");
 
 	@OriginalMember(owner = "client!nb", name = "n", descriptor = "Lclient!na;")
-	public static final JagString aClass100_777 = Static28.parse("details");
+	public static final JagString DETAILS = Static28.parse("details");
 
 	@OriginalMember(owner = "client!nb", name = "a", descriptor = "(IIIIIIIIII)V")
 	public static void method3162(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8) {

client/src/main/java/Static166.java

@@ -14,7 +14,7 @@ public final class Static166 {
 	public static final JagString aClass100_779 = Static28.parse("underlay");
 
 	@OriginalMember(owner = "client!nc", name = "j", descriptor = "I")
-	public static int anInt4051 = 0;
+	public static int mainLoadState = 0;
 
 	@OriginalMember(owner = "client!nc", name = "m", descriptor = "I")
 	public static int anInt4054 = 0;

client/src/main/java/Static167.java

@@ -14,7 +14,7 @@ public final class Static167 {
 	public static int anInt4069;
 
 	@OriginalMember(owner = "client!nd", name = "t", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_63;
+	public static Js5 js5Archive26;
 
 	@OriginalMember(owner = "client!nd", name = "v", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_64;
@@ -46,8 +46,8 @@ public final class Static167 {
 	}
 
 	@OriginalMember(owner = "client!nd", name = "a", descriptor = "(ILclient!ve;)V")
-	public static void method3172(@OriginalArg(1) Js5 arg0) {
-		Static262.anInt5754 = arg0.method4482(Static27.aClass100_165);
-		Static136.anInt3322 = arg0.method4482(Static165.aClass100_776);
+	public static void init(@OriginalArg(1) Js5 arg0) {
+		Static262.anInt5754 = arg0.getGroupId(Static27.aClass100_165);
+		Static136.anInt3322 = arg0.getGroupId(Static165.aClass100_776);
 	}
 }

client/src/main/java/Static170.java

@@ -11,7 +11,7 @@ public final class Static170 {
 	public static int anInt3241 = 128;
 
 	@OriginalMember(owner = "client!nh", name = "fb", descriptor = "[I")
-	public static final int[] anIntArray306 = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+	public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
 
 	@OriginalMember(owner = "client!nh", name = "hb", descriptor = "Lclient!na;")
 	public static final JagString aClass100_623 = Static28.parse("::fps ");

client/src/main/java/Static171.java

@@ -9,7 +9,7 @@ public final class Static171 {
 	public static int anInt4153;
 
 	@OriginalMember(owner = "client!ni", name = "k", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_68;
+	public static Js5 js5Archive19;
 
 	@OriginalMember(owner = "client!ni", name = "q", descriptor = "I")
 	public static int anInt4157;

client/src/main/java/Static172.java

@@ -23,7 +23,7 @@ public final class Static172 {
 	public static int anInt4165;
 
 	@OriginalMember(owner = "client!nj", name = "l", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_71;
+	public static Js5 js5Archive18;
 
 	@OriginalMember(owner = "client!nj", name = "m", descriptor = "[[S")
 	public static short[][] aShortArrayArray7;

client/src/main/java/Static175.java

@@ -15,7 +15,7 @@ public final class Static175 {
 	public static int anInt4220 = 0;
 
 	@OriginalMember(owner = "client!nm", name = "Y", descriptor = "J")
-	public static long aLong138 = 0L;
+	public static long firstGc = 0L;
 
 	@OriginalMember(owner = "client!nm", name = "bb", descriptor = "Lclient!na;")
 	public static final JagString aClass100_798 = Static28.parse("<col=ff0000>");

client/src/main/java/Static176.java

@@ -44,13 +44,13 @@ public final class Static176 {
 		} else {
 			@Pc(62) JagString local62 = Static211.aClass100_230;
 			if (Static83.modeWhere != 0) {
-				local62 = Static34.method882(new JagString[] { Static31.aClass100_193, Static123.method2423(local3.anInt382 + 7000) });
+				local62 = Static34.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.anInt382 + 7000) });
 			}
 			@Pc(89) JagString local89 = Static211.aClass100_230;
 			if (Static47.aClass100_991 != null) {
-				local89 = Static34.method882(new JagString[] { Static167.aClass100_783, Static47.aClass100_991 });
+				local89 = Static34.concatenate(new JagString[] { Static167.aClass100_783, Static47.aClass100_991 });
 			}
-			@Pc(182) JagString local182 = Static34.method882(new JagString[] { Static115.aClass100_582, local3.aClass100_71, local62, Static279.aClass100_1107, Static123.method2423(Static141.anInt3470), aClass100_801, Static123.method2423(Static204.anInt4760), local89, Static139.aClass100_659, Static150.aBoolean175 ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, Static233.aBoolean254 ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, Static249.aBoolean282 ? Static30.aClass100_184 : Static260.aClass100_945 });
+			@Pc(182) JagString local182 = Static34.concatenate(new JagString[] { Static115.aClass100_582, local3.aClass100_71, local62, Static279.aClass100_1107, Static123.parseInt(Static141.anInt3470), aClass100_801, Static123.parseInt(Static204.anInt4760), local89, Static139.aClass100_659, Static150.aBoolean175 ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, Static233.aBoolean254 ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, Static249.aBoolean282 ? Static30.aClass100_184 : Static260.aClass100_945 });
 			try {
 				Static215.aClient1.getAppletContext().showDocument(local182.method3107(), "_self");
 				return true;
@@ -80,9 +80,9 @@ public final class Static176 {
 				}
 			} else {
 				if (Static266.game == 1) {
-					Static98.method1966(-1, 0L, Static186.aClass100_827, local33, (short) 36, LocalizedText.FACEHERE, local47);
+					Static98.method1966(-1, 0L, Static186.EMPTY_FILE, local33, (short) 36, LocalizedText.FACEHERE, local47);
 				}
-				Static98.method1966(-1, 0L, Static186.aClass100_827, local33, (short) 60, Static195.aClass100_859, local47);
+				Static98.method1966(-1, 0L, Static186.EMPTY_FILE, local33, (short) 60, Static195.aClass100_859, local47);
 			}
 		}
 		@Pc(112) long local112 = -1L;
@@ -104,11 +104,11 @@ public final class Static176 {
 						continue;
 					}
 					if (Static260.anInt5014 == 1) {
-						Static98.method1966(Static169.anInt4075, local121, Static34.method882(new JagString[] { Static34.aClass100_203, Static27.aClass100_164, local172.aClass100_830 }), local47, (short) 14, LocalizedText.USE, local147);
+						Static98.method1966(Static169.anInt4075, local121, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static27.aClass100_164, local172.aClass100_830 }), local47, (short) 14, LocalizedText.USE, local147);
 					} else if (Static241.aBoolean302) {
 						@Pc(363) Class3_Sub2_Sub12 local363 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
 						if ((Static274.anInt4999 & 0x4) != 0 && (local363 == null || local172.method3423(local363.anInt2667, Static121.anInt3039) != local363.anInt2667)) {
-							Static98.method1966(Static246.anInt5393, local121, Static34.method882(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.aClass100_830 }), local47, (short) 38, Static102.aClass100_545, local147);
+							Static98.method1966(Static246.anInt5393, local121, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.aClass100_830 }), local47, (short) 38, Static102.aClass100_545, local147);
 						}
 					} else {
 						@Pc(228) JagString[] local228 = local172.aClass100Array130;
@@ -141,11 +141,11 @@ public final class Static176 {
 									if (local240 == 4) {
 										local254 = 1001;
 									}
-									Static98.method1966(local268, local121, Static34.method882(new JagString[] { Static240.aClass100_1008, local172.aClass100_830 }), local47, local254, local228[local240], local147);
+									Static98.method1966(local268, local121, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.aClass100_830 }), local47, local254, local228[local240], local147);
 								}
 							}
 						}
-						Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, Static34.method882(new JagString[] { Static240.aClass100_1008, local172.aClass100_830 }), local47, (short) 1004, LocalizedText.EXAMINE, local147);
+						Static98.method1966(Static225.anInt5073, (long) local172.anInt4426, Static34.concatenate(new JagString[] { Static240.aClass100_1008, local172.aClass100_830 }), local47, (short) 1004, LocalizedText.EXAMINE, local147);
 					}
 				}
 				@Pc(514) int local514;
@@ -209,11 +209,11 @@ public final class Static176 {
 							local240 = local940.aClass8_Sub7_1.anInt5555;
 							@Pc(951) ObjType local951 = Static71.method1439(local240);
 							if (Static260.anInt5014 == 1) {
-								Static98.method1966(Static169.anInt4075, (long) local240, Static34.method882(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 33, LocalizedText.USE, local147);
+								Static98.method1966(Static169.anInt4075, (long) local240, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 33, LocalizedText.USE, local147);
 							} else if (Static241.aBoolean302) {
 								@Pc(1142) Class3_Sub2_Sub12 local1142 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
 								if ((Static274.anInt4999 & 0x1) != 0 && (local1142 == null || local951.method1829(local1142.anInt2667, Static121.anInt3039) != local1142.anInt2667)) {
-									Static98.method1966(Static246.anInt5393, (long) local240, Static34.method882(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 39, Static102.aClass100_545, local147);
+									Static98.method1966(Static246.anInt5393, (long) local240, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local951.aClass100_495 }), local47, (short) 39, Static102.aClass100_545, local147);
 								}
 							} else {
 								@Pc(997) JagString[] local997 = local951.aClass100Array72;
@@ -245,10 +245,10 @@ public final class Static176 {
 										if (local514 == 4) {
 											local1025 = 24;
 										}
-										Static98.method1966(local1041, (long) local240, Static34.method882(new JagString[] { Static8.aClass100_32, local951.aClass100_495 }), local47, local1025, local997[local514], local147);
+										Static98.method1966(local1041, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.aClass100_495 }), local47, local1025, local997[local514], local147);
 									}
 								}
-								Static98.method1966(Static225.anInt5073, (long) local240, Static34.method882(new JagString[] { Static8.aClass100_32, local951.aClass100_495 }), local47, (short) 1002, LocalizedText.EXAMINE, local147);
+								Static98.method1966(Static225.anInt5073, (long) local240, Static34.concatenate(new JagString[] { Static8.aClass100_32, local951.aClass100_495 }), local47, (short) 1002, LocalizedText.EXAMINE, local147);
 							}
 						}
 					}

client/src/main/java/Static180.java

@@ -14,7 +14,7 @@ public final class Static180 {
 	public static JagString[] aClass100Array125;
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;Lclient!ve;B)V")
-	public static void method3324(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
+	public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
 		Static250.aClass153_101 = arg1;
 		@Pc(12) int local12 = (int) (Math.random() * 21.0D) - 10;
 		Static98.aClass153_42 = arg0;
@@ -33,7 +33,7 @@ public final class Static180 {
 	}
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;I)V")
-	public static void method3327(@OriginalArg(0) Js5 arg0) {
+	public static void init(@OriginalArg(0) Js5 arg0) {
 		Static172.aClass153_69 = arg0;
 	}
 

client/src/main/java/Static181.java

@@ -27,7 +27,7 @@ public final class Static181 {
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
 	public static JagString method3341(@OriginalArg(0) int arg0) {
-		return Static34.method882(new JagString[] { Static123.method2423(arg0 >> 24 & 0xFF), Static233.aClass100_994, Static123.method2423(arg0 >> 16 & 0xFF), Static233.aClass100_994, Static123.method2423(arg0 >> 8 & 0xFF), Static233.aClass100_994, Static123.method2423(arg0 & 0xFF) });
+		return Static34.concatenate(new JagString[] { Static123.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 & 0xFF) });
 	}
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I)V")
@@ -71,7 +71,7 @@ public final class Static181 {
 	}
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(ILclient!ve;Lclient!ve;Z)V")
-	public static void method3349(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
+	public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
 		Static30.aBoolean61 = true;
 		Static121.aClass153_45 = arg1;
 		Static146.aClass153_54 = arg0;

client/src/main/java/Static182.java

@@ -39,15 +39,15 @@ public final class Static182 {
 		if (GlRenderer.enabled) {
 			Static46.method1179(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
 			Static46.method1179(GameShell.canvasWidth / 2 - 151, local9 - -1, 302, 32, 0);
-			Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409);
-			Static46.method1186(GameShell.canvasWidth / 2 + Static199.anInt4670 * 3 - 150, local9 + 2, 300 - Static199.anInt4670 * 3, 30, 0);
+			Static46.method1186(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409);
+			Static46.method1186(GameShell.canvasWidth / 2 + Static199.mainLoadPercentage * 3 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0);
 		} else {
 			Static129.method2483(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
 			Static129.method2483(GameShell.canvasWidth / 2 - 151, local9 + 1, 302, 32, 0);
-			Static129.method2495(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409);
-			Static129.method2495(Static199.anInt4670 * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.anInt4670 * 3, 30, 0);
+			Static129.method2495(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409);
+			Static129.method2495(Static199.mainLoadPercentage * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0);
 		}
-		arg1.method2875(Static126.aClass100_602, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1);
+		arg1.method2875(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1);
 	}
 
 	@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;")
@@ -74,7 +74,7 @@ public final class Static182 {
 		@Pc(59) JagString local59 = Static87.method1804(0);
 		@Pc(61) int local61;
 		for (local61 = 0; local61 < arg2; local61++) {
-			local59.method3113(Static123.method2423((int) (arg3 % 10L)));
+			local59.method3113(Static123.parseInt((int) (arg3 % 10L)));
 			arg3 /= 10L;
 		}
 		local61 = 0;
@@ -87,7 +87,7 @@ public final class Static182 {
 				if (arg1 && local61 != 0 && local61 % 3 == 0) {
 					local95.method3113(local26);
 				}
-				local95.method3113(Static123.method2423((int) (arg3 % 10L)));
+				local95.method3113(Static123.parseInt((int) (arg3 % 10L)));
 				local61++;
 				arg3 /= 10L;
 			}
@@ -96,7 +96,7 @@ public final class Static182 {
 		if (local59.length() > 0) {
 			local59.method3113(local28);
 		}
-		return Static34.method882(new JagString[] { local9, local137.method3124(), local59.method3124() });
+		return Static34.concatenate(new JagString[] { local9, local137.method3124(), local59.method3124() });
 	}
 
 	@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IBI[[III)I")

client/src/main/java/Static184.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static184 {
 
 	@OriginalMember(owner = "client!ol", name = "U", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_78;
+	public static Js5 js5Archive10;
 
 	@OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
 	public static int anInt4358;

client/src/main/java/Static186.java

@@ -11,19 +11,19 @@ public final class Static186 {
 	public static boolean aBoolean205 = false;
 
 	@OriginalMember(owner = "client!pa", name = "N", descriptor = "I")
-	public static int anInt4392 = 0;
+	public static int antiAliasingMode = 0;
 
 	@OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;")
-	public static final JagString aClass100_827 = Static28.parse("");
+	public static final JagString EMPTY_FILE = Static28.parse("");
 
 	@OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;")
-	public static JagString password = aClass100_827;
+	public static JagString password = EMPTY_FILE;
 
 	@OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z")
 	public static final boolean[] aBooleanArray100 = new boolean[100];
 
 	@OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;")
-	public static JagString username = aClass100_827;
+	public static JagString username = EMPTY_FILE;
 
 	@OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V")
 	public static void method3413() {
@@ -32,7 +32,7 @@ public final class Static186 {
 		}
 		if (Static41.anInt1309 < 10) {
 			if (!Static119.aClass153_44.method4489(Static269.aClass3_Sub2_Sub4_2.aClass100_138)) {
-				Static41.anInt1309 = Static227.aClass153_94.method4478(Static269.aClass3_Sub2_Sub4_2.aClass100_138) / 10;
+				Static41.anInt1309 = Static227.js5Archive23.method4478(Static269.aClass3_Sub2_Sub4_2.aClass100_138) / 10;
 				return;
 			}
 			Static6.method84();
@@ -90,29 +90,29 @@ public final class Static186 {
 			Static70.method1549(local273, local249);
 			Static41.anInt1309 = 20;
 		} else if (Static41.anInt1309 == 20) {
-			Static33.method868(new Buffer(Static119.aClass153_44.method4485(Static166.aClass100_779, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
+			Static33.method868(new Buffer(Static119.aClass153_44.fetchFile(Static166.aClass100_779, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 30;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 30) {
-			Static47.method3998(new Buffer(Static119.aClass153_44.method4485(Static4.aClass100_7, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
+			Static47.method3998(new Buffer(Static119.aClass153_44.fetchFile(Static4.aClass100_7, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 40;
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 40) {
-			Static231.method3980(new Buffer(Static119.aClass153_44.method4485(Static73.aClass100_455, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
+			Static231.method3980(new Buffer(Static119.aClass153_44.fetchFile(Static73.aClass100_455, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 50;
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 50) {
-			Static166.method3166(new Buffer(Static119.aClass153_44.method4485(Static42.aClass100_331, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
+			Static166.method3166(new Buffer(Static119.aClass153_44.fetchFile(Static42.aClass100_331, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 60;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 60) {
-			if (Static119.aClass153_44.method4497(Static34.method882(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
-				if (!Static119.aClass153_44.method4489(Static34.method882(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
+			if (Static119.aClass153_44.method4497(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
+				if (!Static119.aClass153_44.method4489(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
 					return;
 				}
-				Static203.aClass134_1 = Static140.method2711(Static34.method882(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44);
+				Static203.aClass134_1 = Static140.method2711(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }), Static119.aClass153_44);
 			} else {
 				Static203.aClass134_1 = new Class134(0);
 			}

client/src/main/java/Static195.java

@@ -10,7 +10,7 @@ public final class Static195 {
 	public static int anInt4581;
 
 	@OriginalMember(owner = "client!pk", name = "Z", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_80;
+	public static Js5 js5Archive9;
 
 	@OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
 	public static JagString aClass100_859;

client/src/main/java/Static196.java

@@ -47,18 +47,18 @@ public final class Static196 {
 			Static123.method2418();
 		}
 		if (arg0 == 5) {
-			Static181.method3344(Static209.aClass153_86);
+			Static181.method3344(Static209.js5Archive8);
 		} else {
 			Static119.method2381();
 		}
 		@Pc(106) boolean local106 = Static244.anInt5370 == 5 || Static244.anInt5370 == 10 || Static244.anInt5370 == 28;
 		if (local106 != local37) {
 			if (local37) {
-				Static221.anInt4363 = Static250.anInt5441;
+				Static221.anInt4363 = Static250.titleSong;
 				if (Static12.anInt391 == 0) {
 					Static29.method801();
 				} else {
-					Static257.method526(Static250.anInt5441, Static130.aClass153_47, 255);
+					Static257.method526(Static250.titleSong, Static130.js5Archive6, 255);
 				}
 				Static107.js5NetQueue.method2322(false);
 			} else {

client/src/main/java/Static197.java

@@ -58,11 +58,11 @@ public final class Static197 {
 			if (GameShell.fullScreenFrame != null) {
 				Static22.anInt729 = arg5;
 				Static114.anInt5831 = arg4;
-				Static203.method3663(GameShell.signLink);
+				Static203.write(GameShell.signLink);
 			}
 		}
 		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
-			method3560(true, Static214.anInt5581, true, arg3, -1, -1);
+			method3560(true, Static214.windowMode, true, arg3, -1, -1);
 			return;
 		}
 		@Pc(85) Container local85;
@@ -151,7 +151,7 @@ public final class Static197 {
 				}
 			}
 			if (Static211.aBoolean73) {
-				GlRenderer.init(GameShell.canvas, Static186.anInt4392 * 2);
+				GlRenderer.init(GameShell.canvas, Static186.antiAliasingMode * 2);
 			}
 		}
 		if (!GlRenderer.enabled && arg1 > 0) {
@@ -174,16 +174,16 @@ public final class Static197 {
 			Static76.method1643();
 			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
 			if (Static178.highDetailLighting) {
-				if (Static113.anInt4609 == 1) {
+				if (Static113.brightness == 1) {
 					Rasteriser.setBrightness(0.9F);
 				}
-				if (Static113.anInt4609 == 2) {
+				if (Static113.brightness == 2) {
 					Rasteriser.setBrightness(0.8F);
 				}
-				if (Static113.anInt4609 == 3) {
+				if (Static113.brightness == 3) {
 					Rasteriser.setBrightness(0.7F);
 				}
-				if (Static113.anInt4609 == 4) {
+				if (Static113.brightness == 4) {
 					Rasteriser.setBrightness(0.6F);
 				}
 			}

client/src/main/java/Static199.java

@@ -14,7 +14,7 @@ public final class Static199 {
 	public static HashTable aClass133_20 = new HashTable(16);
 
 	@OriginalMember(owner = "client!qc", name = "P", descriptor = "I")
-	public static int anInt4670 = 10;
+	public static int mainLoadPercentage = 10;
 
 	@OriginalMember(owner = "client!qc", name = "U", descriptor = "I")
 	public static int anInt4672 = 0;
@@ -43,7 +43,7 @@ public final class Static199 {
 	}
 
 	@OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZLclient!ve;)V")
-	public static void method3595(@OriginalArg(1) Js5 arg0) {
+	public static void init(@OriginalArg(1) Js5 arg0) {
 		Static35.aClass153_22 = arg0;
 		Static98.anInt2510 = Static35.aClass153_22.method4504(4);
 	}

client/src/main/java/Static2.java

@@ -92,7 +92,7 @@ public final class Static2 {
 		@Pc(61) int local61 = 0;
 		@Pc(64) int local64 = local53 + 1;
 		Static84.anIntArray209[0] = arg3;
-		@Pc(71) int[][] local71 = Static148.aClass97Array1[Static55.level].anIntArrayArray30;
+		@Pc(71) int[][] local71 = Static148.collisionMaps[Static55.level].anIntArrayArray30;
 		@Pc(193) int local193;
 		while (local61 != local64) {
 			local3 = Static259.anIntArray514[local61];
@@ -103,16 +103,16 @@ public final class Static2 {
 				break;
 			}
 			if (arg1 != 0) {
-				if ((arg1 < 5 || arg1 == 10) && Static148.aClass97Array1[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) {
+				if ((arg1 < 5 || arg1 == 10) && Static148.collisionMaps[Static55.level].method3042(arg4, local3, local8, arg8, arg1 - 1, 2, arg7)) {
 					local59 = true;
 					break;
 				}
-				if (arg1 < 10 && Static148.aClass97Array1[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) {
+				if (arg1 < 10 && Static148.collisionMaps[Static55.level].method3046(arg4, arg1 - 1, arg8, local8, 2, arg7, local3)) {
 					local59 = true;
 					break;
 				}
 			}
-			if (arg0 != 0 && arg6 != 0 && Static148.aClass97Array1[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) {
+			if (arg0 != 0 && arg6 != 0 && Static148.collisionMaps[Static55.level].method3052(arg8, local8, local3, 2, arg0, arg2, arg4, arg6)) {
 				local59 = true;
 				break;
 			}

client/src/main/java/Static203.java

@@ -70,7 +70,7 @@ public final class Static203 {
 	}
 
 	@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Lsignlink!ll;B)V")
-	public static void method3663(@OriginalArg(0) SignLink arg0) {
+	public static void write(@OriginalArg(0) SignLink arg0) {
 		@Pc(11) FileOnDisk local11 = null;
 		try {
 			@Pc(16) PrivilegedRequest local16 = arg0.openPreferences("runescape");

client/src/main/java/Static204.java

@@ -8,7 +8,7 @@ public final class Static204 {
 	public static Sprite aClass3_Sub2_Sub1_10;
 
 	@OriginalMember(owner = "client!qi", name = "C", descriptor = "Lclient!ei;")
-	public static MixerPcmStream aClass3_Sub3_Sub2_1;
+	public static MixerPcmStream soundStream;
 
 	@OriginalMember(owner = "client!qi", name = "r", descriptor = "I")
 	public static int anInt4760 = 0;

client/src/main/java/Static205.java

@@ -11,7 +11,7 @@ public final class Static205 {
 		if (!Static36.method940(arg0).method503(arg1) && arg0.anObjectArray29 == null) {
 			return null;
 		} else if (arg0.aClass100Array18 == null || arg0.aClass100Array18.length <= arg1 || arg0.aClass100Array18[arg1] == null || arg0.aClass100Array18[arg1].method3144().length() == 0) {
-			return Static121.aBoolean154 ? Static34.method882(new JagString[] { Static207.aClass100_903, Static123.method2423(arg1) }) : null;
+			return Static121.aBoolean154 ? Static34.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null;
 		} else {
 			return arg0.aClass100Array18[arg1];
 		}

client/src/main/java/Static207.java

@@ -86,7 +86,7 @@ public final class Static207 {
 	}
 
 	@OriginalMember(owner = "client!ql", name = "b", descriptor = "(I)I")
-	public static int method3684() {
+	public static int fetch() {
 		try {
 			if (Static82.anInt2231 == 0) {
 				if (MonotonicClock.currentTimeMillis() - 5000L < Static231.aLong174) {
@@ -119,18 +119,18 @@ public final class Static207 {
 				Static6.outboundBuffer.p1(255);
 				Static6.outboundBuffer.p4(local82);
 				Static124.socket.write(Static6.outboundBuffer.data, Static6.outboundBuffer.offset);
-				if (Static11.aClass62_1 != null) {
-					Static11.aClass62_1.method3571();
+				if (Static11.musicChannel != null) {
+					Static11.musicChannel.method3571();
 				}
-				if (Static147.aClass62_2 != null) {
-					Static147.aClass62_2.method3571();
+				if (Static147.soundChannel != null) {
+					Static147.soundChannel.method3571();
 				}
 				local124 = Static124.socket.read();
-				if (Static11.aClass62_1 != null) {
-					Static11.aClass62_1.method3571();
+				if (Static11.musicChannel != null) {
+					Static11.musicChannel.method3571();
 				}
-				if (Static147.aClass62_2 != null) {
-					Static147.aClass62_2.method3571();
+				if (Static147.soundChannel != null) {
+					Static147.soundChannel.method3571();
 				}
 				if (local124 != 0) {
 					return Static10.method347(local124);

client/src/main/java/Static209.java

@@ -8,7 +8,7 @@ public final class Static209 {
 	public static int port;
 
 	@OriginalMember(owner = "client!ra", name = "K", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_86;
+	public static Js5 js5Archive8;
 
 	@OriginalMember(owner = "client!ra", name = "J", descriptor = "I")
 	public static int miscTransmitAt = 0;
@@ -24,11 +24,11 @@ public final class Static209 {
 		for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.method2289(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.method2288()) {
 			if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.aClass118_1.anInt4426) {
 				if (local10.aClass3_Sub3_Sub1_1 != null) {
-					Static204.aClass3_Sub3_Sub2_1.method1347(local10.aClass3_Sub3_Sub1_1);
+					Static204.soundStream.method1347(local10.aClass3_Sub3_Sub1_1);
 					local10.aClass3_Sub3_Sub1_1 = null;
 				}
 				if (local10.aClass3_Sub3_Sub1_2 != null) {
-					Static204.aClass3_Sub3_Sub2_1.method1347(local10.aClass3_Sub3_Sub1_2);
+					Static204.soundStream.method1347(local10.aClass3_Sub3_Sub1_2);
 					local10.aClass3_Sub3_Sub1_2 = null;
 				}
 				local10.method4658();

client/src/main/java/Static211.java

@@ -38,16 +38,16 @@ public final class Static211 {
 
 	@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
 	public static void method930() {
-		if (Static11.aClass62_1 != null) {
-			Static11.aClass62_1.method3575();
+		if (Static11.musicChannel != null) {
+			Static11.musicChannel.method3575();
 		}
-		if (Static147.aClass62_2 != null) {
-			Static147.aClass62_2.method3575();
+		if (Static147.soundChannel != null) {
+			Static147.soundChannel.method3575();
 		}
-		Static41.method1045(Static99.aBoolean143);
-		Static11.aClass62_1 = Static107.method2262(22050, GameShell.signLink, GameShell.canvas, 0);
-		Static11.aClass62_1.method3566(Static148.aClass3_Sub3_Sub4_1);
-		Static147.aClass62_2 = Static107.method2262(2048, GameShell.signLink, GameShell.canvas, 1);
-		Static147.aClass62_2.method3566(Static204.aClass3_Sub3_Sub2_1);
+		AudioChannel.init(Static99.stereo);
+		Static11.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0);
+		Static11.musicChannel.setStream(Static148.musicStream);
+		Static147.soundChannel = AudioChannel.create(2048, GameShell.signLink, GameShell.canvas, 1);
+		Static147.soundChannel.setStream(Static204.soundStream);
 	}
 }

client/src/main/java/Static213.java

@@ -10,7 +10,7 @@ public final class Static213 {
 	public static int anInt4851;
 
 	@OriginalMember(owner = "client!re", name = "B", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_88;
+	public static Js5 js5Archive0;
 
 	@OriginalMember(owner = "client!re", name = "a", descriptor = "(I)V")
 	public static void method3729() {

client/src/main/java/Static214.java

@@ -8,7 +8,7 @@ public final class Static214 {
 	public static int anInt5577;
 
 	@OriginalMember(owner = "client!rg", name = "z", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_106;
+	public static Js5 js5Archive11;
 
 	@OriginalMember(owner = "client!rg", name = "C", descriptor = "I")
 	public static int anInt5579;
@@ -23,7 +23,7 @@ public final class Static214 {
 	public static final int[] anIntArray492 = new int[14];
 
 	@OriginalMember(owner = "client!rg", name = "F", descriptor = "I")
-	public static int anInt5581 = 0;
+	public static int windowMode = 0;
 
 	@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
 	public static void method4359(@OriginalArg(0) Player arg0) {

client/src/main/java/Static216.java

@@ -59,18 +59,18 @@ public final class Static216 {
 				@Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL);
 				Static6.outboundBuffer.p1(local120);
 				Static124.socket.write(Static6.outboundBuffer.data, 2);
-				if (Static11.aClass62_1 != null) {
-					Static11.aClass62_1.method3571();
+				if (Static11.musicChannel != null) {
+					Static11.musicChannel.method3571();
 				}
-				if (Static147.aClass62_2 != null) {
-					Static147.aClass62_2.method3571();
+				if (Static147.soundChannel != null) {
+					Static147.soundChannel.method3571();
 				}
 				@Pc(150) int local150 = Static124.socket.read();
-				if (Static11.aClass62_1 != null) {
-					Static11.aClass62_1.method3571();
+				if (Static11.musicChannel != null) {
+					Static11.musicChannel.method3571();
 				}
-				if (Static147.aClass62_2 != null) {
-					Static147.aClass62_2.method3571();
+				if (Static147.soundChannel != null) {
+					Static147.soundChannel.method3571();
 				}
 				if (local150 != 0) {
 					Static266.anInt5336 = local150;
@@ -126,41 +126,41 @@ public final class Static216 {
 				Static17.aClass3_Sub15_Sub1_2.p1(Static144.method2736());
 				Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasWidth);
 				Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasHeight);
-				Static17.aClass3_Sub15_Sub1_2.p1(Static186.anInt4392);
+				Static17.aClass3_Sub15_Sub1_2.p1(Static186.antiAliasingMode);
 				Static140.method2705(Static17.aClass3_Sub15_Sub1_2);
 				Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991);
 				Static17.aClass3_Sub15_Sub1_2.p4(Static204.anInt4760);
 				Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746());
 				Static18.sentToServer = true;
 				Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443);
-				Static17.aClass3_Sub15_Sub1_2.p4(Static213.aClass153_88.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static249.aClass153_100.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static274.aClass153_90.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static41.aClass153_25.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static248.aClass153_75.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static26.aClass153_16.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static130.aClass153_47.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static267.aClass153_109.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static209.aClass153_86.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static195.aClass153_80.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static184.aClass153_78.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static214.aClass153_106.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static16.aClass153_9.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static261.aClass153_107.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static137.aClass153_49.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static138.aClass153_51.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static280.aClass153_110.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static138.aClass153_50.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static172.aClass153_71.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static171.aClass153_68.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static253.aClass153_104.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static122.aClass153_46.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static156.aClass153_59.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static227.aClass153_94.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static254.aClass153_105.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static28.aClass153_18.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static167.aClass153_63.method4480());
-				Static17.aClass3_Sub15_Sub1_2.p4(Static226.aClass153_93.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static213.js5Archive0.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static249.js5Archive1.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static274.js5Archive2.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static41.js5Archive3.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static248.js5Archive4.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static26.js5Archive5.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static130.js5Archive6.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static267.js5Archive7.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static209.js5Archive8.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static195.js5Archive9.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static184.js5Archive10.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static214.js5Archive11.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static16.js5Archive12.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static261.js5Archive13.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static137.js5Archive14.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static138.js5Archive15.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static280.js5Archive16.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static138.js5Archive17.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static172.js5Archive18.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static171.js5Archive19.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static253.js5Archive20.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static122.js5Archive21.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static156.js5Archive22.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static227.js5Archive23.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static254.js5Archive24.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static28.js5Archive25.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static167.js5Archive26.method4480());
+				Static17.aClass3_Sub15_Sub1_2.p4(Static226.js5Archive27.method4480());
 				if (GlobalConfig.LOGIN_FAKE_IDX28) {
 					Static17.aClass3_Sub15_Sub1_2.p4(0);
 				}

client/src/main/java/Static217.java

@@ -44,16 +44,16 @@ public final class Static217 {
 			}
 			@Pc(95) JagString local95 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
 			if (arg2.anInt1652 < arg2.anInt1656) {
-				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static78.aClass100_465, Static123.method2423(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
+				local158 = Static34.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
 			} else {
-				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static72.aClass100_448 });
+				local158 = Static34.concatenate(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.self.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.anInt1652), Static72.aClass100_448 });
 			}
 		} else {
-			local158 = Static34.method882(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.method2423(arg2.anInt1671), Static72.aClass100_448 });
+			local158 = Static34.concatenate(new JagString[] { arg2.method1264(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 });
 		}
 		@Pc(275) int local275;
 		if (Static260.anInt5014 == 1) {
-			Static98.method1966(Static169.anInt4075, (long) arg0, Static34.method882(new JagString[] { Static34.aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1);
+			Static98.method1966(Static169.anInt4075, (long) arg0, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1);
 		} else if (!Static241.aBoolean302) {
 			for (local275 = 7; local275 >= 0; local275--) {
 				if (Static160.aClass100Array121[local275] != null) {
@@ -74,15 +74,15 @@ public final class Static217 {
 					}
 					@Pc(353) short local353 = Static5.aShortArray2[local275];
 					@Pc(358) short local358 = (short) (local353 + local291);
-					Static98.method1966(Static191.anIntArray388[local275], (long) arg0, Static34.method882(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Static160.aClass100Array121[local275], arg1);
+					Static98.method1966(Static191.anIntArray388[local275], (long) arg0, Static34.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Static160.aClass100Array121[local275], arg1);
 				}
 			}
 		} else if ((Static274.anInt4999 & 0x8) != 0) {
-			Static98.method1966(Static246.anInt5393, (long) arg0, Static34.method882(new JagString[] { Static78.aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, Static102.aClass100_545, arg1);
+			Static98.method1966(Static246.anInt5393, (long) arg0, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, Static102.aClass100_545, arg1);
 		}
 		for (local275 = 0; local275 < Static231.anInt5204; local275++) {
 			if (Static39.aShortArray6[local275] == 60) {
-				Static233.aClass100Array160[local275] = Static34.method882(new JagString[] { Static204.aClass100_896, local158 });
+				Static233.aClass100Array160[local275] = Static34.concatenate(new JagString[] { Static204.aClass100_896, local158 });
 				break;
 			}
 		}
@@ -119,17 +119,17 @@ public final class Static217 {
 			((Js5GlTextureProvider) Rasteriser.textureProvider).method3247();
 		}
 		Static105.aClass54_9.method1815();
-		Static213.aClass153_88.method4499();
-		Static249.aClass153_100.method4499();
-		Static41.aClass153_25.method4499();
-		Static248.aClass153_75.method4499();
-		Static26.aClass153_16.method4499();
-		Static130.aClass153_47.method4499();
-		Static267.aClass153_109.method4499();
-		Static209.aClass153_86.method4499();
-		Static184.aClass153_78.method4499();
-		Static214.aClass153_106.method4499();
-		Static16.aClass153_9.method4499();
+		Static213.js5Archive0.method4499();
+		Static249.js5Archive1.method4499();
+		Static41.js5Archive3.method4499();
+		Static248.js5Archive4.method4499();
+		Static26.js5Archive5.method4499();
+		Static130.js5Archive6.method4499();
+		Static267.js5Archive7.method4499();
+		Static209.js5Archive8.method4499();
+		Static184.js5Archive10.method4499();
+		Static214.js5Archive11.method4499();
+		Static16.js5Archive12.method4499();
 		Static73.aClass99_10.method3104();
 	}
 

client/src/main/java/Static220.java

@@ -72,7 +72,7 @@ public final class Static220 {
 		@Pc(4) long local4 = (long) arg2;
 		@Pc(10) Model local10 = (Model) Static110.aClass99_15.method3106(local4);
 		if (local10 == null) {
-			@Pc(22) RawModel local22 = Static77.method1686(Static267.aClass153_109, arg2);
+			@Pc(22) RawModel local22 = Static77.method1686(Static267.js5Archive7, arg2);
 			if (local22 == null) {
 				return null;
 			}

client/src/main/java/Static225.java

@@ -82,7 +82,7 @@ public final class Static225 {
 		Static186.password = arg1;
 		Static5.anInt39 = arg2;
 		Static186.username = arg0;
-		if (Static186.username.method3108(Static186.aClass100_827) || Static186.password.method3108(Static186.aClass100_827)) {
+		if (Static186.username.method3108(Static186.EMPTY_FILE) || Static186.password.method3108(Static186.EMPTY_FILE)) {
 			Static266.anInt5336 = 3;
 		} else if (Static125.worldId == -1) {
 			Static20.anInt673 = 0;

client/src/main/java/Static226.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static226 {
 
 	@OriginalMember(owner = "client!sf", name = "b", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_93;
+	public static Js5 js5Archive27;
 
 	@OriginalMember(owner = "client!sf", name = "c", descriptor = "I")
 	public static int anInt5080;
@@ -54,7 +54,7 @@ public final class Static226 {
 	}
 
 	@OriginalMember(owner = "client!sf", name = "a", descriptor = "(BLclient!ve;)V")
-	public static void method3899(@OriginalArg(1) Js5 arg0) {
+	public static void init(@OriginalArg(1) Js5 arg0) {
 		Static39.aClass153_23 = arg0;
 	}
 

client/src/main/java/Static227.java

@@ -9,7 +9,7 @@ public final class Static227 {
 	public static Component aClass13_25;
 
 	@OriginalMember(owner = "client!sg", name = "k", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_94;
+	public static Js5 js5Archive23;
 
 	@OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
 	public static int anInt5096;

client/src/main/java/Static230.java

@@ -100,7 +100,7 @@ public final class Static230 {
 	}
 
 	@OriginalMember(owner = "client!sj", name = "a", descriptor = "(Lclient!ve;B)V")
-	public static void method3951(@OriginalArg(0) Js5 arg0) {
+	public static void init(@OriginalArg(0) Js5 arg0) {
 		Static81.aClass153_34 = arg0;
 		Static165.anInt4043 = Static81.aClass153_34.method4504(16);
 	}
@@ -156,13 +156,13 @@ public final class Static230 {
 		try {
 			@Pc(17) JagString local17 = Static272.aClass100_989.method3153(GameShell.signLink.applet);
 			@Pc(23) JagString local23 = Static246.aClass100_1029.method3153(GameShell.signLink.applet);
-			@Pc(48) JagString local48 = Static34.method882(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 });
+			@Pc(48) JagString local48 = Static34.concatenate(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 });
 			if (arg0.length() == 0) {
-				local48 = Static34.method882(new JagString[] { local48, Static245.aClass100_1018 });
+				local48 = Static34.concatenate(new JagString[] { local48, Static245.aClass100_1018 });
 			} else {
-				local48 = Static34.method882(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) });
+				local48 = Static34.concatenate(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) });
 			}
-			Static34.method882(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(GameShell.signLink.applet);
+			Static34.concatenate(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(GameShell.signLink.applet);
 		} catch (@Pc(124) Throwable local124) {
 		}
 	}

client/src/main/java/Static231.java

@@ -297,7 +297,7 @@ public final class Static231 {
 	}
 
 	@OriginalMember(owner = "client!sk", name = "a", descriptor = "(Lclient!ve;I)Z")
-	public static boolean method3986(@OriginalArg(0) Js5 arg0) {
+	public static boolean isReady(@OriginalArg(0) Js5 arg0) {
 		return arg0.method4506(Static138.anInt3443);
 	}
 }

client/src/main/java/Static233.java

@@ -105,7 +105,7 @@ public final class Static233 {
 							@Pc(99) int local99 = local89 / 8 + (local83 / 8 << 8);
 							for (@Pc(101) int local101 = 0; local101 < Static238.anIntArray470.length; local101++) {
 								if (Static238.anIntArray470[local101] == local99 && local21[local101] != null) {
-									Static217.method3771(Static148.aClass97Array1, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
+									Static217.method3771(Static148.collisionMaps, local29, local21[local101], local67, local77, local36 * 8, local43 * 8, arg0, (local83 & 0x7) * 8, (local89 & 0x7) * 8);
 									break;
 								}
 							}

client/src/main/java/Static234.java

@@ -146,7 +146,7 @@ public final class Static234 {
 		Static241.aClass3_Sub2_Sub1_Sub1Array13 = arg0;
 		Static258.aBooleanArray130 = new boolean[Static241.aClass3_Sub2_Sub1_Sub1Array13.length];
 		Static228.aClass69_120.method2278();
-		@Pc(25) int local25 = Static119.aClass153_44.method4482(Static54.aClass100_374);
+		@Pc(25) int local25 = Static119.aClass153_44.getGroupId(Static54.aClass100_374);
 		@Pc(30) int[] local30 = Static119.aClass153_44.method4503(local25);
 		for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
 			Static228.aClass69_120.method2282(Static210.method3713(new Buffer(Static119.aClass153_44.method4495(local25, local30[local32]))));

client/src/main/java/Static241.java

@@ -44,7 +44,7 @@ public final class Static241 {
 	}
 
 	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
-	public static void method4540(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
+	public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		Static97.aLong89 = 0L;
 		@Pc(4) int local4 = Static144.method2736();
 		if (arg1 == 3 || local4 == 3) {
@@ -80,7 +80,7 @@ public final class Static241 {
 	}
 
 	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZBLclient!ve;Lclient!dd;Lclient!ve;)V")
-	public static void method4542(@OriginalArg(2) Js5 arg0, @OriginalArg(3) SoftwareFont arg1, @OriginalArg(4) Js5 arg2) {
+	public static void init(@OriginalArg(2) Js5 arg0, @OriginalArg(3) SoftwareFont arg1, @OriginalArg(4) Js5 arg2) {
 		Static240.aBoolean276 = true;
 		Static230.aClass153_95 = arg2;
 		Static167.aClass153_61 = arg0;

client/src/main/java/Static246.java

@@ -14,7 +14,7 @@ public final class Static246 {
 	public static final JagString aClass100_1029 = Static28.parse("cookiehost");
 
 	@OriginalMember(owner = "client!u", name = "a", descriptor = "(BLclient!ve;Lclient!ve;)V")
-	public static void method4237(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
+	public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
 		Static153.aClass153_57 = arg0;
 		Static243.aClass153_97 = arg1;
 	}
@@ -50,14 +50,14 @@ public final class Static246 {
 		@Pc(35) JagString local35 = arg0.aClass100_738;
 		if (arg0.anInt3726 != 0) {
 			@Pc(47) JagString local47 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
-			local35 = Static34.method882(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.method2423(arg0.anInt3726), Static72.aClass100_448 });
+			local35 = Static34.concatenate(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.self.anInt1652), Static123.aClass100_593, local47, Static123.parseInt(arg0.anInt3726), Static72.aClass100_448 });
 		}
 		if (Static260.anInt5014 == 1) {
-			Static98.method1966(Static169.anInt4075, (long) arg2, Static34.method882(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
+			Static98.method1966(Static169.anInt4075, (long) arg2, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
 		} else if (Static241.aBoolean302) {
 			@Pc(378) Class3_Sub2_Sub12 local378 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
 			if ((Static274.anInt4999 & 0x2) != 0 && (local378 == null || arg0.method2936(Static121.anInt3039, local378.anInt2667) != local378.anInt2667)) {
-				Static98.method1966(anInt5393, (long) arg2, Static34.method882(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, Static102.aClass100_545, arg3);
+				Static98.method1966(anInt5393, (long) arg2, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, Static102.aClass100_545, arg3);
 			}
 		} else {
 			@Pc(129) JagString[] local129 = arg0.aClass100Array116;
@@ -91,7 +91,7 @@ public final class Static246 {
 						if (local140 == 4) {
 							local161 = 2;
 						}
-						Static98.method1966(local176, (long) arg2, Static34.method882(new JagString[] { Static226.aClass100_965, local35 }), arg1, local161, local129[local140], arg3);
+						Static98.method1966(local176, (long) arg2, Static34.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, local161, local129[local140], arg3);
 					}
 				}
 			}
@@ -121,11 +121,11 @@ public final class Static246 {
 						if (local281 != 0) {
 							local281 += local271;
 						}
-						Static98.method1966(arg0.anInt3752, (long) arg2, Static34.method882(new JagString[] { Static226.aClass100_965, local35 }), arg1, local281, local129[local140], arg3);
+						Static98.method1966(arg0.anInt3752, (long) arg2, Static34.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, local281, local129[local140], arg3);
 					}
 				}
 			}
-			Static98.method1966(Static225.anInt5073, (long) arg2, Static34.method882(new JagString[] { Static226.aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
+			Static98.method1966(Static225.anInt5073, (long) arg2, Static34.concatenate(new JagString[] { Static226.aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
 		}
 	}
 

client/src/main/java/Static248.java

@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static248 {
 
 	@OriginalMember(owner = "client!uc", name = "c", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_75;
+	public static Js5 js5Archive4;
 
 	@OriginalMember(owner = "client!uc", name = "d", descriptor = "[[[I")
 	public static int[][][] anIntArrayArrayArray17;

client/src/main/java/Static249.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static249 {
 
 	@OriginalMember(owner = "client!ud", name = "J", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_100;
+	public static Js5 js5Archive1;
 
 	@OriginalMember(owner = "client!ud", name = "K", descriptor = "I")
 	public static int worldListDefaultPort;

client/src/main/java/Static250.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static250 {
 
 	@OriginalMember(owner = "client!uf", name = "m", descriptor = "I")
-	public static int anInt5441;
+	public static int titleSong;
 
 	@OriginalMember(owner = "client!uf", name = "p", descriptor = "I")
 	public static int anInt5443;

client/src/main/java/Static252.java

@@ -7,7 +7,7 @@ public final class Static252 {
 	public static Js5 aClass153_103;
 
 	@OriginalMember(owner = "client!uh", name = "Y", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1049 = Static28.parse("huffman");
+	public static final JagString HUFFMAN_GROUP = Static28.parse("huffman");
 
 	@OriginalMember(owner = "client!uh", name = "ab", descriptor = "Lclient!q;")
 	public static final ReferenceNodeFactory aClass22_1 = Static44.method1147();

client/src/main/java/Static253.java

@@ -14,7 +14,7 @@ public final class Static253 {
 	public static float aFloat36;
 
 	@OriginalMember(owner = "client!ui", name = "cb", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_104;
+	public static Js5 js5Archive20;
 
 	@OriginalMember(owner = "client!ui", name = "eb", descriptor = "[[[B")
 	public static byte[][][] aByteArrayArrayArray16;
@@ -123,9 +123,9 @@ public final class Static253 {
 			GlRenderer.setDepthTestEnabled(true);
 			GlRenderer.setFogEnabled(true);
 			if (Static244.anInt5370 == 10) {
-				local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.anInt4609, Static138.anInt3439 >> 10);
+				local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.brightness, Static138.anInt3439 >> 10);
 			} else {
-				local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.anInt4609, Static173.self.movementQueueX[0] >> 3);
+				local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.brightness, Static173.self.movementQueueX[0] >> 3);
 			}
 			Static120.method2394(Static83.anInt372, !Static11.aBoolean15);
 			GlRenderer.clearColorAndDepthBuffers(local171);

client/src/main/java/Static254.java

@@ -14,7 +14,7 @@ public final class Static254 {
 	public static int anInt5559;
 
 	@OriginalMember(owner = "client!uj", name = "J", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_105;
+	public static Js5 js5Archive24;
 
 	@OriginalMember(owner = "client!uj", name = "s", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1061 = Static28.parse("null");

client/src/main/java/Static257.java

@@ -8,7 +8,7 @@ public final class Static257 {
 	public static Component aClass13_7;
 
 	@OriginalMember(owner = "client!v", name = "f", descriptor = "Lclient!al;")
-	public static Js5MasterIndex aClass9_2;
+	public static Js5MasterIndex js5MasterIndex;
 
 	@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_98 = Static28.parse(")4a=");

client/src/main/java/Static258.java

@@ -21,26 +21,26 @@ public final class Static258 {
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V")
 	public static void method4418(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) {
 		if (arg2.anInt530 == 1) {
-			Static98.method1966(-1, 0L, Static186.aClass100_827, 0, (short) 8, arg2.aClass100_89, arg2.anInt507);
+			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 8, arg2.aClass100_89, arg2.anInt507);
 		}
 		@Pc(47) JagString local47;
 		if (arg2.anInt530 == 2 && !Static241.aBoolean302) {
 			local47 = Static97.method1963(arg2);
 			if (local47 != null) {
-				Static98.method1966(-1, 0L, Static34.method882(new JagString[] { Static42.aClass100_332, arg2.aClass100_85 }), -1, (short) 32, local47, arg2.anInt507);
+				Static98.method1966(-1, 0L, Static34.concatenate(new JagString[] { Static42.aClass100_332, arg2.aClass100_85 }), -1, (short) 32, local47, arg2.anInt507);
 			}
 		}
 		if (arg2.anInt530 == 3) {
-			Static98.method1966(-1, 0L, Static186.aClass100_827, 0, (short) 28, LocalizedText.CLOSE, arg2.anInt507);
+			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 28, LocalizedText.CLOSE, arg2.anInt507);
 		}
 		if (arg2.anInt530 == 4) {
-			Static98.method1966(-1, 0L, Static186.aClass100_827, 0, (short) 59, arg2.aClass100_89, arg2.anInt507);
+			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 59, arg2.aClass100_89, arg2.anInt507);
 		}
 		if (arg2.anInt530 == 5) {
-			Static98.method1966(-1, 0L, Static186.aClass100_827, 0, (short) 51, arg2.aClass100_89, arg2.anInt507);
+			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 51, arg2.aClass100_89, arg2.anInt507);
 		}
 		if (arg2.anInt530 == 6 && Static39.aClass13_10 == null) {
-			Static98.method1966(-1, 0L, Static186.aClass100_827, -1, (short) 41, arg2.aClass100_89, arg2.anInt507);
+			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, -1, (short) 41, arg2.aClass100_89, arg2.anInt507);
 		}
 		@Pc(173) int local173;
 		@Pc(171) int local171;
@@ -62,12 +62,12 @@ public final class Static258 {
 							@Pc(276) ObjType local276 = Static71.method1439(arg2.objTypes[local171] - 1);
 							if (Static260.anInt5014 == 1 && local267.method510()) {
 								if (Static224.anInt5062 != arg2.anInt507 || Static185.anInt4370 != local171) {
-									Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 40, LocalizedText.USE, arg2.anInt507);
+									Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static34.aClass100_203, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 40, LocalizedText.USE, arg2.anInt507);
 								}
 							} else if (Static241.aBoolean302 && local267.method510()) {
 								@Pc(596) Class3_Sub2_Sub12 local596 = Static121.anInt3039 == -1 ? null : Static110.method2277(Static121.anInt3039);
 								if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.method1829(local596.anInt2667, Static121.anInt3039) != local596.anInt2667)) {
-									Static98.method1966(Static246.anInt5393, (long) local276.anInt2354, Static34.method882(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 3, Static102.aClass100_545, arg2.anInt507);
+									Static98.method1966(Static246.anInt5393, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static223.aClass100_947, local276.aClass100_495 }), local171, (short) 3, Static102.aClass100_545, arg2.anInt507);
 								}
 							} else {
 								@Pc(296) JagString[] local296 = local276.aClass100Array71;
@@ -84,12 +84,12 @@ public final class Static258 {
 											} else {
 												local334 = 58;
 											}
-											Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.anInt507);
+											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.anInt507);
 										}
 									}
 								}
 								if (local267.method507()) {
-									Static98.method1966(Static169.anInt4075, (long) local276.anInt2354, Static34.method882(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, (short) 22, LocalizedText.USE, arg2.anInt507);
+									Static98.method1966(Static169.anInt4075, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, (short) 22, LocalizedText.USE, arg2.anInt507);
 								}
 								if (local267.method510() && local296 != null) {
 									for (local309 = 2; local309 >= 0; local309--) {
@@ -104,7 +104,7 @@ public final class Static258 {
 											if (local309 == 2) {
 												local334 = 43;
 											}
-											Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.anInt507);
+											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.anInt507);
 										}
 									}
 								}
@@ -131,11 +131,11 @@ public final class Static258 {
 											if (local309 == 4) {
 												local334 = 13;
 											}
-											Static98.method1966(-1, (long) local276.anInt2354, Static34.method882(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.anInt507);
+											Static98.method1966(-1, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, local334, local296[local309], arg2.anInt507);
 										}
 									}
 								}
-								Static98.method1966(Static225.anInt5073, (long) local276.anInt2354, Static34.method882(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, (short) 1006, LocalizedText.EXAMINE, arg2.anInt507);
+								Static98.method1966(Static225.anInt5073, (long) local276.anInt2354, Static34.concatenate(new JagString[] { Static8.aClass100_32, local276.aClass100_495 }), local171, (short) 1006, LocalizedText.EXAMINE, arg2.anInt507);
 							}
 						}
 					}
@@ -164,10 +164,10 @@ public final class Static258 {
 				}
 			}
 			if (Static36.method940(arg2).method506()) {
-				Static98.method1966(-1, 0L, Static186.aClass100_827, arg2.componentId, (short) 41, LocalizedText.CONTINUE, arg2.anInt507);
+				Static98.method1966(-1, 0L, Static186.EMPTY_FILE, arg2.componentId, (short) 41, LocalizedText.CONTINUE, arg2.anInt507);
 			}
 		} else if (Static36.method940(arg2).method508() && (Static274.anInt4999 & 0x20) != 0) {
-			Static98.method1966(Static246.anInt5393, 0L, Static34.method882(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.componentId, (short) 12, Static102.aClass100_545, arg2.anInt507);
+			Static98.method1966(Static246.anInt5393, 0L, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.componentId, (short) 12, Static102.aClass100_545, arg2.anInt507);
 		}
 	}
 

client/src/main/java/Static26.java

@@ -8,7 +8,7 @@ public final class Static26 {
 	public static int[] anIntArray66;
 
 	@OriginalMember(owner = "client!ca", name = "Z", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_16;
+	public static Js5 js5Archive5;
 
     @OriginalMember(owner = "client!ca", name = "X", descriptor = "Lclient!ih;")
 	public static LinkedList aClass69_27 = new LinkedList();
@@ -47,11 +47,11 @@ public final class Static26 {
 			for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
 				@Pc(115) int local115 = (local80 << 8) + local97;
 				Static238.anIntArray470[local74] = local115;
-				Static36.anIntArray84[local74] = aClass153_16.method4482(Static34.method882(new JagString[] { Static103.aClass100_558, Static123.method2423(local80), Static86.aClass100_488, Static123.method2423(local97) }));
-				Static172.anIntArray366[local74] = aClass153_16.method4482(Static34.method882(new JagString[] { Static270.aClass100_1090, Static123.method2423(local80), Static86.aClass100_488, Static123.method2423(local97) }));
-				Static175.anIntArray371[local74] = aClass153_16.method4482(Static34.method882(new JagString[] { Static179.aClass100_807, Static123.method2423(local80), Static86.aClass100_488, Static123.method2423(local97) }));
-				Static99.anIntArray239[local74] = aClass153_16.method4482(Static34.method882(new JagString[] { Static165.aClass100_772, Static123.method2423(local80), Static86.aClass100_488, Static123.method2423(local97) }));
-				Static35.anIntArray82[local74] = aClass153_16.method4482(Static34.method882(new JagString[] { Static278.aClass100_1103, Static123.method2423(local80), Static86.aClass100_488, Static123.method2423(local97) }));
+				Static36.anIntArray84[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
+				Static172.anIntArray366[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
+				Static175.anIntArray371[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
+				Static99.anIntArray239[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
+				Static35.anIntArray82[local74] = js5Archive5.getGroupId(Static34.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
 				if (Static175.anIntArray371[local74] == -1) {
 					Static36.anIntArray84[local74] = -1;
 					Static172.anIntArray366[local74] = -1;
@@ -92,7 +92,7 @@ public final class Static26 {
 				@Pc(45) int local45 = (Static238.anIntArray470[local25] >> 8) * 64 - Static225.originX;
 				@Pc(56) int local56 = (Static238.anIntArray470[local25] & 0xFF) * 64 - Static142.originZ;
 				Static107.method2261();
-				Static124.method2437(local45, arg0, local32, local56, Static148.aClass97Array1);
+				Static124.method2437(local45, arg0, local32, local56, Static148.collisionMaps);
 			}
 		}
 	}

client/src/main/java/Static260.java

@@ -179,11 +179,11 @@ public final class Static260 {
 		@Pc(14) AreaSound local14;
 		for (local14 = (AreaSound) Static3.aClass69_135.method2289(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.method2288()) {
 			if (local14.aClass3_Sub3_Sub1_1 != null) {
-				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_1);
+				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_1);
 				local14.aClass3_Sub3_Sub1_1 = null;
 			}
 			if (local14.aClass3_Sub3_Sub1_2 != null) {
-				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_2);
+				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_2);
 				local14.aClass3_Sub3_Sub1_2 = null;
 			}
 			local14.method4658();
@@ -193,14 +193,14 @@ public final class Static260 {
 		}
 		for (local14 = (AreaSound) Static152.aClass69_87.method2289(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.method2288()) {
 			if (local14.aClass3_Sub3_Sub1_1 != null) {
-				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_1);
+				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_1);
 				local14.aClass3_Sub3_Sub1_1 = null;
 			}
 			local14.method4658();
 		}
 		for (local14 = (AreaSound) Static93.aClass133_7.method3859(); local14 != null; local14 = (AreaSound) Static93.aClass133_7.method3861()) {
 			if (local14.aClass3_Sub3_Sub1_1 != null) {
-				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_1);
+				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_1);
 				local14.aClass3_Sub3_Sub1_1 = null;
 			}
 			local14.method4658();

client/src/main/java/Static261.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static261 {
 
 	@OriginalMember(owner = "client!ve", name = "l", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_107;
+	public static Js5 js5Archive13;
 
 	@OriginalMember(owner = "client!ve", name = "t", descriptor = "I")
 	public static int anInt5731;

client/src/main/java/Static262.java

@@ -55,6 +55,6 @@ public final class Static262 {
 
 	@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
 	public static JagString method4510(@OriginalArg(0) int arg0) {
-		return arg0 >= 999999999 ? Static220.aClass100_930 : Static123.method2423(arg0);
+		return arg0 >= 999999999 ? Static220.aClass100_930 : Static123.parseInt(arg0);
 	}
 }

client/src/main/java/Static265.java

@@ -8,7 +8,7 @@ public final class Static265 {
 	public static int anInt5765;
 
 	@OriginalMember(owner = "client!vj", name = "j", descriptor = "Lclient!dd;")
-	public static SoftwareFont aClass3_Sub2_Sub9_Sub1_2;
+	public static SoftwareFont p11FullSoftware;
 
 	@OriginalMember(owner = "client!vj", name = "m", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1086 = Static28.parse("_labels");

client/src/main/java/Static266.java

@@ -26,7 +26,7 @@ public final class Static266 {
 	public static int game = 0;
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V")
-	public static void method4187(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
+	public static void init(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
 		Static93.aClass153_41 = arg0;
 		Static132.aClass153_48 = arg1;
 	}