Autoformat using tab characters

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.awt.Component;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.Component;
+
 @OriginalClass("client!vh")
 public class AudioChannel {
 
@@ -166,7 +167,8 @@ public class AudioChannel {
 			@Pc(45) int local45 = 0;
 			@Pc(47) int local47 = 255;
 			@Pc(49) int local49 = 7;
-			label106: while (local47 != 0) {
+			label106:
+			while (local47 != 0) {
 				@Pc(57) int local57;
 				@Pc(62) int local62;
 				if (local49 < 0) {
@@ -181,7 +183,8 @@ public class AudioChannel {
 						local47 &= ~(0x1 << local57);
 						@Pc(91) PcmStream local91 = null;
 						@Pc(96) PcmStream local96 = this.aClass3_Sub3Array5[local57];
-						label100: while (true) {
+						label100:
+						while (true) {
 							while (true) {
 								if (local96 == null) {
 									break label100;

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

@@ -17,7 +17,7 @@ public class BasTypeList {
 
 	@OriginalMember(owner = "client!hb", name = "a", descriptor = "(ZI)Lclient!ck;")
 	public static BasType get(@OriginalArg(1) int arg0) {
-        @Pc(10) BasType local10 = (BasType) types.get((long) arg0);
+		@Pc(10) BasType local10 = (BasType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -27,7 +27,7 @@ public class BasTypeList {
 			local10.decode(new Buffer(local21));
 		}
 		local10.method878();
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public class Base37 {
 	@OriginalMember(owner = "client!ch", name = "v", descriptor = "[B")
-    public static final byte[] aByteArray12 = new byte[] { 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 };
+	public static final byte[] aByteArray12 = new byte[]{95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57};
 
 	@OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;")
 	public static JagString decode37(@OriginalArg(1) long arg0) {

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

@@ -1,9 +1,10 @@
 package rt4;
 
-import java.io.InputStream;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+import java.io.InputStream;
+
 @OriginalClass("client!qk")
 public final class BrokenInputStream extends InputStream {
 

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
 @OriginalClass("client!vg")
 public final class BrokenOutputStream extends OutputStream {
 

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

@@ -1,10 +1,10 @@
 package rt4;
 
-import java.applet.Applet;
-// import netscape.javascript.JSObject;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 
+import java.applet.Applet;
+
 public final class BrowserControl {
 
 	@OriginalMember(owner = "client!gh", name = "a", descriptor = "(Ljava/lang/String;BLjava/applet/Applet;)Ljava/lang/Object;")

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

@@ -1,13 +1,14 @@
 package rt4;
 
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+
 @OriginalClass("client!en")
 public final class BufferedFile {
 

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

@@ -1,19 +1,15 @@
 package rt4;
 
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Shape;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
-import java.awt.image.DirectColorModel;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.util.Hashtable;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.Component;
+import java.awt.*;
+import java.awt.image.*;
+import java.util.Hashtable;
+
 @OriginalClass("client!ti")
 public final class BufferedImageFrameBuffer extends FrameBuffer {
 

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

@@ -1,14 +1,15 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
+import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
+
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalClass;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ma")
 public final class BufferedSocket implements Runnable {
@@ -60,9 +61,11 @@ public final class BufferedSocket implements Runnable {
 			while (true) {
 				@Pc(39) int len;
 				@Pc(24) int off;
-				ready: {
+				ready:
+				{
 					synchronized (this) {
-						close: {
+						close:
+						{
 							if (this.writePointer == this.readPointer) {
 								if (this.closed) {
 									break close;

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

@@ -3,7 +3,6 @@ package rt4;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ea")
 public final class ByteArrayNode extends Node {

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

@@ -37,7 +37,8 @@ public final class Bzip2Decompressor {
 		@Pc(25) int local25 = arg0.strmAvailOut;
 		@Pc(27) int local27 = local25;
 		@Pc(32) int local32 = arg0.saveNblock + 1;
-		returnNotr: while (true) {
+		returnNotr:
+		while (true) {
 			if (local5 > 0) {
 				while (true) {
 					if (local25 == 0) {
@@ -226,11 +227,7 @@ public final class Bzip2Decompressor {
 				@Pc(141) int local141;
 				for (local141 = 0; local141 < 16; local141++) {
 					local61 = getBit(arg0);
-					if (local61 == 1) {
+					arg0.inUse16[local141] = local61 == 1;
-						arg0.inUse16[local141] = true;
-					} else {
-						arg0.inUse16[local141] = false;
-					}
 				}
 				for (local141 = 0; local141 < 256; local141++) {
 					arg0.inUse[local141] = false;

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.io.EOFException;
-import java.io.IOException;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.io.EOFException;
+import java.io.IOException;
+
 @OriginalClass("client!ge")
 public final class Cache {
 
@@ -64,7 +65,7 @@ public final class Cache {
 					local27 = null;
 					return (byte[]) local27;
 				}
-				this.index.seek((long) (group * 6));
+				this.index.seek(group * 6);
 				this.index.read(0, buffer, 6);
 				@Pc(69) int local69 = ((buffer[3] & 0xFF) << 16) - (-((buffer[4] & 0xFF) << 8) - (buffer[5] & 0xFF));
 				@Pc(99) int local99 = (buffer[2] & 0xFF) + ((buffer[1] & 0xFF) << 8) + ((buffer[0] & 0xFF) << 16);
@@ -84,7 +85,7 @@ public final class Cache {
 							return (byte[]) local27;
 						}
 						@Pc(157) int local157 = local99 - local136;
-						this.data.seek((long) (local69 * 520));
+						this.data.seek(local69 * 520);
 						if (local157 > 512) {
 							local157 = 512;
 						}
@@ -129,7 +130,7 @@ public final class Cache {
 						local27 = false;
 						return local27;
 					}
-					this.index.seek((long) (arg1 * 6));
+					this.index.seek(arg1 * 6);
 					this.index.read(0, buffer, 6);
 					local67 = ((buffer[3] & 0xFF) << 16) + (buffer[4] << 8 & 0xFF00) + (buffer[5] & 0xFF);
 					if (local67 <= 0 || this.data.length() / 520L < (long) local67) {
@@ -150,15 +151,16 @@ public final class Cache {
 				buffer[3] = (byte) (local67 >> 16);
 				@Pc(156) int local156 = 0;
 				buffer[1] = (byte) (arg0 >> 8);
-				this.index.seek((long) (arg1 * 6));
+				this.index.seek(arg1 * 6);
 				this.index.write(buffer, 0, 6);
 				while (true) {
 					if (local125 < arg0) {
-						label134: {
+						label134:
+						{
 							@Pc(189) int local189 = 0;
 							@Pc(248) int local248;
 							if (arg3) {
-								this.data.seek((long) (local67 * 520));
+								this.data.seek(local67 * 520);
 								try {
 									this.data.read(0, buffer, 8);
 								} catch (@Pc(209) EOFException local209) {
@@ -203,7 +205,7 @@ public final class Cache {
 							buffer[3] = (byte) local156;
 							local156++;
 							buffer[5] = (byte) (local189 >> 8);
-							this.data.seek((long) (local67 * 520));
+							this.data.seek(local67 * 520);
 							local67 = local189;
 							this.data.write(buffer, 0, 8);
 							this.data.write(arg2, local125, local248);

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

@@ -187,15 +187,15 @@ public class Camera {
 		@Pc(236) int local236 = local23 - anInt40;
 		@Pc(241) int local241 = local9 - renderZ;
 		@Pc(246) int local246 = local15 - renderX;
-        @Pc(257) int local257 = (int) Math.sqrt((double) (local246 * local246 + local241 * local241));
+		@Pc(257) int local257 = (int) Math.sqrt(local246 * local246 + local241 * local241);
-        @Pc(268) int local268 = (int) (Math.atan2((double) local236, (double) local257) * 325.949D) & 0x7FF;
+		@Pc(268) int local268 = (int) (Math.atan2(local236, local257) * 325.949D) & 0x7FF;
 		if (local268 < 128) {
 			local268 = 128;
 		}
 		if (local268 > 383) {
 			local268 = 383;
 		}
-        @Pc(292) int local292 = (int) (-325.949D * Math.atan2((double) local246, (double) local241)) & 0x7FF;
+		@Pc(292) int local292 = (int) (-325.949D * Math.atan2(local246, local241)) & 0x7FF;
 		if (cameraPitch < local268) {
 			cameraPitch += anInt5230 + Static233.anInt5217 * (local268 - cameraPitch) / 1000;
 			if (cameraPitch > local268) {
@@ -245,11 +245,7 @@ public class Camera {
 		anInt5224 += local27;
 		if (anInt5224 >= 65535) {
 			anInt5224 = 65535;
-            if (aBoolean205) {
+			aBoolean16 = !aBoolean205;
-                aBoolean16 = false;
-            } else {
-                aBoolean16 = true;
-            }
 			aBoolean205 = true;
 		} else {
 			aBoolean205 = false;
@@ -292,9 +288,9 @@ public class Camera {
 		@Pc(363) float local363 = local226[0] - renderCoordinates[0];
 		@Pc(371) float local371 = local226[2] - renderCoordinates[2];
 		@Pc(382) float local382 = (local226[1] - renderCoordinates[1]) * -1.0F;
-        @Pc(392) double local392 = Math.sqrt((double) (local371 * local371 + local363 * local363));
+		@Pc(392) double local392 = Math.sqrt(local371 * local371 + local363 * local363);
-        Static146.aFloat15 = (float) Math.atan2((double) local382, local392);
+		Static146.aFloat15 = (float) Math.atan2(local382, local392);
-        aFloat10 = -((float) Math.atan2((double) local363, (double) local371));
+		aFloat10 = -((float) Math.atan2(local363, local371));
 		cameraPitch = (int) ((double) Static146.aFloat15 * 325.949D) & 0x7FF;
 		cameraYaw = (int) ((double) aFloat10 * 325.949D) & 0x7FF;
 	}
@@ -313,9 +309,9 @@ public class Camera {
 			@Pc(49) int local49 = local44 - anInt40;
 			@Pc(54) int local54 = local30 - renderX;
 			@Pc(59) int local59 = local36 - renderZ;
-			@Pc(70) int local70 = (int) Math.sqrt((double) (local59 * local59 + local54 * local54));
+			@Pc(70) int local70 = (int) Math.sqrt(local59 * local59 + local54 * local54);
-			cameraPitch = (int) (Math.atan2((double) local49, (double) local70) * 325.949D) & 0x7FF;
+			cameraPitch = (int) (Math.atan2(local49, local70) * 325.949D) & 0x7FF;
-			cameraYaw = (int) (Math.atan2((double) local54, (double) local59) * -325.949D) & 0x7FF;
+			cameraYaw = (int) (Math.atan2(local54, local59) * -325.949D) & 0x7FF;
 			if (cameraPitch < 128) {
 				cameraPitch = 128;
 			}

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

@@ -98,7 +98,7 @@ public class Cheat {
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
 	public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(66) JagString local66 = JagString.concatenate(new JagString[] { aClass100_521, JagString.parseInt(arg2), Static70.aClass100_760, JagString.parseInt(arg0 >> 6), Static70.aClass100_760, JagString.parseInt(arg1 >> 6), Static70.aClass100_760, JagString.parseInt(arg0 & 0x3F), Static70.aClass100_760, JagString.parseInt(arg1 & 0x3F) });
+		@Pc(66) JagString local66 = JagString.concatenate(new JagString[]{aClass100_521, JagString.parseInt(arg2), Static70.aClass100_760, JagString.parseInt(arg0 >> 6), Static70.aClass100_760, JagString.parseInt(arg1 >> 6), Static70.aClass100_760, JagString.parseInt(arg0 & 0x3F), Static70.aClass100_760, JagString.parseInt(arg1 & 0x3F)});
 		local66.print();
 		execute(local66);
 	}
@@ -116,7 +116,7 @@ public class Cheat {
 				}
 				local29 = Runtime.getRuntime();
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_892, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
+				Chat.add(null, 0, JagString.concatenate(new JagString[]{aClass100_892, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
 			}
 			@Pc(117) int local117;
 			if (arg0.equalsIgnoreCase(MM)) {
@@ -126,17 +126,17 @@ public class Cheat {
 				}
 				local29 = Runtime.getRuntime();
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
+				Chat.add(null, 0, JagString.concatenate(new JagString[]{aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
 				Player.method501();
 				client.method2380();
 				for (local117 = 0; local117 < 10; local117++) {
 					System.gc();
 				}
 				local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-                Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
+				Chat.add(null, 0, JagString.concatenate(new JagString[]{aClass100_1093, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
 			}
 			if (arg0.equalsIgnoreCase(PCACHESIZE)) {
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(PlayerAppearance.method1029()) }));
+				Chat.add(null, 0, JagString.concatenate(new JagString[]{aClass100_335, JagString.parseInt(PlayerAppearance.method1029())}));
 			}
 			if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) {
 				System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry);
@@ -203,7 +203,7 @@ public class Cheat {
 			}
 			if (arg0.startsWith(RECT_DEBUG)) {
 				rectDebug = arg0.substring(12).trim().parseInt();
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, JagString.parseInt(rectDebug) }));
+				Chat.add(null, 0, JagString.concatenate(new JagString[]{RECT_DEBUG_EQUALS, JagString.parseInt(rectDebug)}));
 			}
 			if (arg0.equalsIgnoreCase(QA_OP_TEST)) {
 				Static121.qaOpTest = true;

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

@@ -165,7 +165,7 @@ public class ClientProt {
 			}
 		}
 		if (!local13) {
-            Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 }));
+			Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[]{LocalizedText.UNABLETOFIND, local7}));
 		}
 	}
 
@@ -218,10 +218,10 @@ public class ClientProt {
 		}
 
 		if (LoginManager.mapElementList == null) {
-            if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }))) {
+			if (LoginManager.map == null || !client.js5Archive23.isGroupNameValid(JagString.concatenate(new JagString[]{LoginManager.map.group, aClass100_363}))) {
 				LoginManager.mapElementList = new MapElementList(0);
-            } else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }))) {
+			} else if (client.js5Archive23.isGroupReady(JagString.concatenate(new JagString[]{LoginManager.map.group, aClass100_363}))) {
-                LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[] { LoginManager.map.group, aClass100_363 }), client.js5Archive23);
+				LoginManager.mapElementList = MapElementList.create(JagString.concatenate(new JagString[]{LoginManager.map.group, aClass100_363}), client.js5Archive23);
 			} else {
 				fileExists = false;
 				mapFilesMissingCount++;
@@ -267,7 +267,7 @@ public class ClientProt {
 		}
 
 		if (Static233.loadingScreenState != 0) {
-            Static114.drawTextOnScreen(true, JagString.concatenate(new JagString[] { LocalizedText.LOADING, COMPLETE_PERCENT}));
+			Static114.drawTextOnScreen(true, JagString.concatenate(new JagString[]{LocalizedText.LOADING, COMPLETE_PERCENT}));
 		}
 
 		client.audioLoop();
@@ -403,8 +403,8 @@ public class ClientProt {
 			for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
 				for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
 					if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
-                        client.js5Archive5.prefetchGroup(JagString.concatenate(new JagString[] { LoginManager.aClass100_558, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
+						client.js5Archive5.prefetchGroup(JagString.concatenate(new JagString[]{LoginManager.aClass100_558, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850)}));
-                        client.js5Archive5.prefetchGroup(JagString.concatenate(new JagString[] { LoginManager.aClass100_1090, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850) }));
+						client.js5Archive5.prefetchGroup(JagString.concatenate(new JagString[]{LoginManager.aClass100_1090, JagString.parseInt(local837), LoginManager.UNDERSCORE, JagString.parseInt(local850)}));
 					}
 				}
 			}

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

@@ -413,9 +413,7 @@ public final class CollisionMap {
 				if (endX == startX - 1 && endZ == startZ && (this.flags[endX][endZ] & 0x8) == 0) {
 					return true;
 				}
-				if (startX + 1 == endX && startZ == endZ && (this.flags[endX][endZ] & 0x80) == 0) {
+				return startX + 1 == endX && startZ == endZ && (this.flags[endX][endZ] & 0x80) == 0;
-					return true;
-				}
 			}
 		} else {
 			@Pc(785) int x1 = size + endX - 1;
@@ -528,9 +526,7 @@ public final class CollisionMap {
 				if (startX - size == endX && startZ >= endZ && startZ <= z1 && (this.flags[x1][startZ] & 0x12C0108) == 0) {
 					return true;
 				}
-				if (endX == startX + 1 && startZ >= endZ && z1 >= startZ && (this.flags[endX][startZ] & 0x12C0180) == 0) {
+				return endX == startX + 1 && startZ >= endZ && z1 >= startZ && (this.flags[endX][startZ] & 0x12C0180) == 0;
-					return true;
-				}
 			}
 		}
 		return false;
@@ -618,9 +614,7 @@ public final class CollisionMap {
 				if (startX - 1 == endX && endZ == startZ && (this.flags[endX][endZ] & 0x8) == 0) {
 					return true;
 				}
-				if (endX == startX + 1 && startZ == endZ && (this.flags[endX][endZ] & 0x80) == 0) {
+				return endX == startX + 1 && startZ == endZ && (this.flags[endX][endZ] & 0x80) == 0;
-					return true;
-				}
 			}
 		} else {
 			@Pc(414) int x1 = endX + size - 1;
@@ -669,9 +663,7 @@ public final class CollisionMap {
 				if (endX == startX - size && endZ <= startZ && z1 >= startZ && (this.flags[x1][startZ] & 0x8) == 0) {
 					return true;
 				}
-				if (endX == startX + 1 && startZ >= endZ && startZ <= z1 && (this.flags[endX][startZ] & 0x80) == 0) {
+				return endX == startX + 1 && startZ >= endZ && startZ <= z1 && (this.flags[endX][startZ] & 0x80) == 0;
-					return true;
-				}
 			}
 		}
 		return false;

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

@@ -15,7 +15,7 @@ public class ColorUtils {
 		@Pc(25) double local25 = 0.0D;
 		@Pc(32) double local32 = (double) (arg0 & 0xFF) / 256.0D;
 		@Pc(34) double local34 = local10;
-        @Pc(37) double local37 = (double) 0;
+		@Pc(37) double local37 = 0;
 		@Pc(39) double local39 = local10;
 		if (local10 > local19) {
 			local34 = local19;

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

@@ -794,7 +794,7 @@ public final class Component {
 		if (local29 == -1) {
 			return null;
 		}
-		@Pc(43) Sprite local43 = (Sprite) sprites.get((long) local29);
+		@Pc(43) Sprite local43 = (Sprite) sprites.get(local29);
 		if (local43 != null) {
 			return local43;
 		}
@@ -802,7 +802,7 @@ public final class Component {
 		if (local43 == null) {
 			aBoolean72 = true;
 		} else {
-			sprites.put(local43, (long) local29);
+			sprites.put(local43, local29);
 		}
 		return local43;
 	}
@@ -869,7 +869,7 @@ public final class Component {
 		} else {
 			@Pc(61) Model local61;
 			if (local10 == 1) {
-				local61 = (Model) models.get((long) ((local10 << 16) + local13));
+				local61 = (Model) models.get((local10 << 16) + local13);
 				if (local61 == null) {
 					@Pc(69) RawModel local69 = RawModel.create(InterfaceList.aClass153_85, local13);
 					if (local69 == null) {
@@ -877,7 +877,7 @@ public final class Component {
 						return null;
 					}
 					local61 = local69.createModel(64, 768, -50, -10, -50);
-					models.put(local61, (long) (local13 + (local10 << 16)));
+					models.put(local61, local13 + (local10 << 16));
 				}
 				if (arg1 != null) {
 					local61 = arg1.method4215(local61, arg0, arg3, arg2);
@@ -1183,7 +1183,7 @@ public final class Component {
 		if (this.font == -1) {
 			return null;
 		}
-		@Pc(21) Font local21 = (Font) fonts.get((long) this.font);
+		@Pc(21) Font local21 = (Font) fonts.get(this.font);
 		if (local21 != null) {
 			return local21;
 		}
@@ -1192,7 +1192,7 @@ public final class Component {
 			aBoolean72 = true;
 		} else {
 			local21.setNameIcons(arg0, null);
-			fonts.put(local21, (long) this.font);
+			fonts.put(local21, this.font);
 		}
 		return local21;
 	}

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

@@ -19,13 +19,13 @@ public final class CursorType {
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(B)Lclient!mm;")
 	public final SoftwareSprite getSprite() {
-		@Pc(7) SoftwareSprite local7 = (SoftwareSprite) CursorTypeList.sprites.get((long) this.spriteId);
+		@Pc(7) SoftwareSprite local7 = (SoftwareSprite) CursorTypeList.sprites.get(this.spriteId);
 		if (local7 != null) {
 			return local7;
 		}
 		local7 = SoftwareSprite.loadSoftwareAlphaSprite(CursorTypeList.spritesArchive, this.spriteId);
 		if (local7 != null) {
-			CursorTypeList.sprites.put(local7, (long) this.spriteId);
+			CursorTypeList.sprites.put(local7, this.spriteId);
 		}
 		return local7;
 	}

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

@@ -22,7 +22,7 @@ public class CursorTypeList {
 
 	@OriginalMember(owner = "client!qg", name = "d", descriptor = "(II)Lclient!ia;")
 	public static CursorType get(@OriginalArg(0) int arg0) {
-        @Pc(10) CursorType local10 = (CursorType) types.get((long) arg0);
+		@Pc(10) CursorType local10 = (CursorType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -31,7 +31,7 @@ public class CursorTypeList {
 		if (local20 != null) {
 			local10.decode(new Buffer(local20), arg0);
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -60,7 +60,7 @@ public final class DateUtil {
 	private static final JagString OCT = JagString.parse("Oct");
 
 	@OriginalMember(owner = "client!km", name = "Ac", descriptor = "[Lclient!na;")
-	public static final JagString[] MONTHS = new JagString[] {JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC};
+	public static final JagString[] MONTHS = new JagString[]{JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC};
 	@OriginalMember(owner = "client!rl", name = "T", descriptor = "Lclient!na;")
 	private static final JagString SAT = JagString.parse("Sat");
 	@OriginalMember(owner = "client!rl", name = "U", descriptor = "Lclient!na;")
@@ -76,7 +76,7 @@ public final class DateUtil {
 	@OriginalMember(owner = "client!rl", name = "bb", descriptor = "Lclient!na;")
 	private static final JagString THU = JagString.parse("Thu");
 	@OriginalMember(owner = "client!rl", name = "Y", descriptor = "[Lclient!na;")
-	public static final JagString[] DAYS = new JagString[] {SUN, MON, TUE, WED, THU, FRI, SAT};
+	public static final JagString[] DAYS = new JagString[]{SUN, MON, TUE, WED, THU, FRI, SAT};
 
 	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;")
 	public static JagString getDateString(@OriginalArg(0) long date) {
@@ -88,6 +88,6 @@ public final class DateUtil {
 		@Pc(36) int local36 = calendar.get(Calendar.HOUR_OF_DAY);
 		@Pc(40) int local40 = calendar.get(Calendar.MINUTE);
 		@Pc(44) int local44 = calendar.get(Calendar.SECOND);
-		return JagString.concatenate(new JagString[] { DAYS[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), aClass100_1089, MONTHS[local21], aClass100_1089, JagString.parseInt(local32), SPACE, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), TIMEZONE});
+		return JagString.concatenate(new JagString[]{DAYS[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), aClass100_1089, MONTHS[local21], aClass100_1089, JagString.parseInt(local32), SPACE, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), TIMEZONE});
 	}
 }

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.nio.ByteBuffer;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!ua")
 public final class DirectByteArray extends ByteArray {
 

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

@@ -54,10 +54,7 @@ public final class DisplayMode {
 		if (arg1 == 3 || mode == 3) {
 			arg0 = true;
 		}
-		@Pc(44) boolean useHd = false;
+		@Pc(44) boolean useHd = mode > 0 != arg1 > 0;
-		if (mode > 0 != arg1 > 0) {
-			useHd = true;
-		}
 		if (arg0 && arg1 > 0) {
 			useHd = true;
 		}
@@ -227,11 +224,7 @@ public final class DisplayMode {
 		if (arg2) {
 			client.method2721();
 		}
-		if (arg1 >= 2) {
+		aBoolean156 = arg1 >= 2;
-			aBoolean156 = true;
-		} else {
-			aBoolean156 = false;
-		}
 		if (InterfaceList.topLevelInterface != -1) {
 			InterfaceList.method3712(true);
 		}
@@ -250,7 +243,8 @@ public final class DisplayMode {
 			@Pc(16) DisplayMode[] local16 = method3558(GameShell.signLink);
 			@Pc(20) DisplayMode[] local20 = new DisplayMode[local16.length];
 			@Pc(22) int local22 = 0;
-			label52: for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
+			label52:
+			for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
 				@Pc(32) DisplayMode local32 = local16[local24];
 				if ((local32.bitDepth <= 0 || local32.bitDepth >= 24) && local32.width >= 800 && local32.height >= 600) {
 					for (@Pc(52) int local52 = 0; local52 < local22; local52++) {

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

@@ -47,7 +47,7 @@ public final class EnumType extends SecondaryNode {
 				} else {
 					local70 = new IntNode(arg1.g4());
 				}
-				this.table.put(local70, (long) local58);
+				this.table.put(local70, local58);
 			}
 		}
 	}
@@ -57,7 +57,7 @@ public final class EnumType extends SecondaryNode {
 		if (this.table == null) {
 			return this.defaultString;
 		} else {
-			@Pc(26) StringNode local26 = (StringNode) this.table.get((long) arg0);
+			@Pc(26) StringNode local26 = (StringNode) this.table.get(arg0);
 			return local26 == null ? this.defaultString : local26.value;
 		}
 	}
@@ -92,7 +92,7 @@ public final class EnumType extends SecondaryNode {
 		if (this.table == null) {
 			return this.defaultInt;
 		} else {
-			@Pc(18) IntNode local18 = (IntNode) this.table.get((long) arg0);
+			@Pc(18) IntNode local18 = (IntNode) this.table.get(arg0);
 			return local18 == null ? this.defaultInt : local18.value;
 		}
 	}
@@ -105,7 +105,7 @@ public final class EnumType extends SecondaryNode {
 		if (this.inverseTable == null) {
 			this.inverseInts();
 		}
-		@Pc(34) IntNode node = (IntNode) this.inverseTable.get((long) arg0);
+		@Pc(34) IntNode node = (IntNode) this.inverseTable.get(arg0);
 		return node != null;
 	}
 
@@ -114,7 +114,7 @@ public final class EnumType extends SecondaryNode {
 		this.inverseTable = new HashTable(this.table.getBucketCount());
 		for (@Pc(24) IntNode node = (IntNode) this.table.head(); node != null; node = (IntNode) this.table.next()) {
 			@Pc(34) IntNode inverseNode = new IntNode((int) node.key);
-			this.inverseTable.put(inverseNode, (long) node.value);
+			this.inverseTable.put(inverseNode, node.value);
 		}
 	}
 

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

@@ -17,7 +17,7 @@ public class EnumTypeList {
 
 	@OriginalMember(owner = "client!ui", name = "a", descriptor = "(IZ)Lclient!ml;")
 	public static EnumType get(@OriginalArg(0) int arg0) {
-        @Pc(10) EnumType local10 = (EnumType) types.get((long) arg0);
+		@Pc(10) EnumType local10 = (EnumType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -26,7 +26,7 @@ public class EnumTypeList {
 		if (local24 != null) {
 			local10.decode(new Buffer(local24));
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public class Flames {
 	@OriginalMember(owner = "client!se", name = "t", descriptor = "[I")
-    public static final int[] anIntArray445 = new int[] { 12543016, 15504954, 15914854, 16773818 };
+	public static final int[] anIntArray445 = new int[]{12543016, 15504954, 15914854, 16773818};
 	@OriginalMember(owner = "client!bb", name = "m", descriptor = "Lclient!na;")
 	public static final JagString RUNES = JagString.parse("runes");
 	@OriginalMember(owner = "client!km", name = "Yc", descriptor = "I")

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

@@ -20,7 +20,7 @@ public class FloTypeList {
 
 	@OriginalMember(owner = "client!um", name = "a", descriptor = "(BI)Lclient!wl;")
 	public static FloType method4395(@OriginalArg(1) int arg0) {
-        @Pc(6) FloType local6 = (FloType) types.get((long) arg0);
+		@Pc(6) FloType local6 = (FloType) types.get(arg0);
 		if (local6 != null) {
 			return local6;
 		}
@@ -29,7 +29,7 @@ public class FloTypeList {
 		if (local30 != null) {
 			local6.decode(new Buffer(local30), arg0);
 		}
-        types.put(local6, (long) arg0);
+		types.put(local6, arg0);
 		return local6;
 	}
 

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

@@ -12,7 +12,7 @@ public class FluTypeList {
 
 	@OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZI)Lclient!ni;")
 	public static FluType get(@OriginalArg(1) int arg0) {
-        @Pc(10) FluType local10 = (FluType) types.get((long) arg0);
+		@Pc(10) FluType local10 = (FluType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -21,7 +21,7 @@ public class FluTypeList {
 		if (local27 != null) {
 			local10.decode(arg0, new Buffer(local27));
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -1,6 +1,6 @@
 package rt4;
 
-import com.jogamp.opengl.*;
+import com.jogamp.opengl.GL2;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
@@ -71,11 +71,11 @@ public final class FogManager {
 		@Pc(34) float local34 = (float) (arg0 >> 16 & 0xFF) / 255.0F;
 		@Pc(43) float local43 = (float) (arg0 >> 8 & 0xFF) / 255.0F;
 		@Pc(50) float local50 = (float) (arg0 & 0xFF) / 255.0F;
-		@Pc(75) float[] local75 = new float[] { arg1 * local34, arg1 * local43, arg1 * local50, 1.0F };
+		@Pc(75) float[] local75 = new float[]{arg1 * local34, arg1 * local43, arg1 * local50, 1.0F};
 		local25.glLightModelfv(GL2.GL_LIGHT_MODEL_AMBIENT, local75, 0);
-		@Pc(105) float[] local105 = new float[] { arg2 * local34, arg2 * local43, arg2 * local50, 1.0F };
+		@Pc(105) float[] local105 = new float[]{arg2 * local34, arg2 * local43, arg2 * local50, 1.0F};
 		local25.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, local105, 0);
-		@Pc(139) float[] local139 = new float[] { -arg3 * local34, -arg3 * local43, -arg3 * local50, 1.0F };
+		@Pc(139) float[] local139 = new float[]{-arg3 * local34, -arg3 * local43, -arg3 * local50, 1.0F};
 		local25.glLightfv(GL2.GL_LIGHT1, GL2.GL_DIFFUSE, local139, 0);
 	}
 
@@ -94,7 +94,7 @@ public final class FogManager {
 		gl.glFogf(GL2.GL_FOG_DENSITY, 0.95F);
 		gl.glHint(GL2.GL_FOG_HINT, GL2.GL_FASTEST);
 		int fogEnd = GlobalConfig.VIEW_DISTANCE;
-		@Pc(65) int fogStart = fogEnd - (int)(GlobalConfig.VIEW_FADE_DISTANCE * 2.0f) - offset;
+		@Pc(65) int fogStart = fogEnd - (int) (GlobalConfig.VIEW_FADE_DISTANCE * 2.0f) - offset;
 		if (fogStart < 50) {
 			fogStart = 50;
 		}
@@ -128,10 +128,10 @@ public final class FogManager {
 		@Pc(1) GL2 local1 = GlRenderer.gl;
 		local1.glColorMaterial(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE);
 		local1.glEnable(GL2.GL_COLOR_MATERIAL);
-		@Pc(27) float[] local27 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
+		@Pc(27) float[] local27 = new float[]{0.0F, 0.0F, 0.0F, 1.0F};
 		local1.glLightfv(GL2.GL_LIGHT0, GL2.GL_AMBIENT, local27, 0);
 		local1.glEnable(GL2.GL_LIGHT0);
-		@Pc(55) float[] local55 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
+		@Pc(55) float[] local55 = new float[]{0.0F, 0.0F, 0.0F, 1.0F};
 		local1.glLightfv(GL2.GL_LIGHT1, GL2.GL_AMBIENT, local55, 0);
 		local1.glEnable(GL2.GL_LIGHT1);
 		anInt3919 = -1;

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.util.Random;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.util.Random;
+
 @OriginalClass("client!rk")
 public abstract class Font extends SecondaryNode {
 
@@ -329,7 +330,7 @@ public abstract class Font extends SecondaryNode {
 
 	@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;I)I")
 	public final int getMaxLineWidth(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
-		@Pc(10) int local10 = this.splitParagraph(arg0, new int[] { arg1 }, lines);
+		@Pc(10) int local10 = this.splitParagraph(arg0, new int[]{arg1}, lines);
 		@Pc(12) int local12 = 0;
 		for (@Pc(14) int local14 = 0; local14 < local10; local14++) {
 			@Pc(23) int local23 = this.getStringWidth(lines[local14]);
@@ -411,7 +412,7 @@ public abstract class Font extends SecondaryNode {
 		if (arg0 == null) {
 			return 0;
 		}
-		arg3.setSeed((long) arg4);
+		arg3.setSeed(arg4);
 		this.setColors(16777215, 0, (arg3.nextInt() & 0x1F) + 192);
 		@Pc(21) int local21 = arg0.length();
 		@Pc(24) int[] local24 = new int[local21];
@@ -428,7 +429,7 @@ public abstract class Font extends SecondaryNode {
 
 	@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;I)I")
 	public final int getParagraphLineCount(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
-		return this.splitParagraph(arg0, new int[] { arg1 }, lines);
+		return this.splitParagraph(arg0, new int[]{arg1}, lines);
 	}
 
 	@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;)V")
@@ -670,7 +671,7 @@ public abstract class Font extends SecondaryNode {
 		if (arg9 == 0) {
 			arg9 = this.lineHeight;
 		}
-		@Pc(20) int[] local20 = new int[] { arg3 };
+		@Pc(20) int[] local20 = new int[]{arg3};
 		if (arg4 < this.paragraphTopPadding + this.paragraphBottomPadding + arg9 && arg4 < arg9 + arg9) {
 			local20 = null;
 		}
@@ -850,7 +851,7 @@ public abstract class Font extends SecondaryNode {
 		if (arg0 == null) {
 			return 0;
 		}
-		arg9.setSeed((long) arg10);
+		arg9.setSeed(arg10);
 		this.setColors(arg5, arg6, (arg9.nextInt() & 0x1F) + 192);
 		@Pc(21) int local21 = arg0.length();
 		@Pc(24) int[] local24 = new int[local21];

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

@@ -10,14 +10,14 @@ public class FontMetricsList {
 
 	@OriginalMember(owner = "client!li", name = "a", descriptor = "(II)Lclient!dd;")
 	public static SoftwareFont get(@OriginalArg(1) int arg0) {
-        @Pc(16) SoftwareFont local16 = (SoftwareFont) fontMetrics.get((long) arg0);
+		@Pc(16) SoftwareFont local16 = (SoftwareFont) fontMetrics.get(arg0);
 		if (local16 != null) {
 			return local16;
 		}
 		@Pc(26) byte[] local26 = client.js5Archive13.fetchFile(arg0, 0);
 		local16 = new SoftwareFont(local26);
 		local16.setNameIcons(Sprites.nameIcons, null);
-        fontMetrics.put(local16, (long) arg0);
+		fontMetrics.put(local16, arg0);
 		return local16;
 	}
 }

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

@@ -1,12 +1,12 @@
 package rt4;
 
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Image;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+import java.awt.Component;
+import java.awt.*;
+
 @OriginalClass("client!vk")
 public abstract class FrameBuffer {
 

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

@@ -34,11 +34,7 @@ public class FriendsList {
 				return true;
 			}
 		}
-		if (arg0.equalsIgnoreCase(PlayerList.self.username)) {
+		return arg0.equalsIgnoreCase(PlayerList.self.username);
-			return true;
-		} else {
-			return false;
-		}
 	}
 
 	@OriginalMember(owner = "client!fb", name = "a", descriptor = "(JB)V")
@@ -54,13 +50,13 @@ public class FriendsList {
 		@Pc(42) int local42;
 		for (local42 = 0; local42 < size; local42++) {
 			if (encodedUsernames[local42] == arg0) {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE}));
+				Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[]{local35, LocalizedText.FRIENDLISTDUPE}));
 				return;
 			}
 		}
 		for (local42 = 0; local42 < IgnoreList.size; local42++) {
 			if (arg0 == IgnoreList.encodedUsernames[local42]) {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE}));
+				Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[]{LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE}));
 				return;
 			}
 		}

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

@@ -1,12 +1,12 @@
 package rt4;
 
-import java.awt.Canvas;
-import java.awt.Component;
-import java.awt.Graphics;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+import java.awt.Component;
+import java.awt.*;
+
 @OriginalClass("client!tm")
 public final class GameCanvas extends Canvas {
 

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

@@ -1,15 +1,16 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
+import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
+
 import java.applet.Applet;
 import java.applet.AppletContext;
 import java.awt.*;
 import java.awt.event.*;
 import java.lang.reflect.Method;
 import java.net.URL;
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalClass;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!rc")
 public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener {
@@ -85,10 +86,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!ba", name = "B", descriptor = "I")
 	public static double VARIABLE_RENDER_RATE = 20.0d;
-	public static long VARIABLE_RENDER_RATE_NS = (long)(VARIABLE_RENDER_RATE * 1_000_000.0d);
+	public static long VARIABLE_RENDER_RATE_NS = (long) (VARIABLE_RENDER_RATE * 1_000_000.0d);
 
 	public static final double FIXED_UPDATE_RATE = 20.0d;
-	public static final long FIXED_UPDATE_RATE_NS = (long)(FIXED_UPDATE_RATE * 1_000_000.0d);
+	public static final long FIXED_UPDATE_RATE_NS = (long) (FIXED_UPDATE_RATE * 1_000_000.0d);
 
 	@OriginalMember(owner = "client!cm", name = "b", descriptor = "Ljava/lang/Thread;")
 	public static Thread thread;
@@ -173,8 +174,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(II)V")
 	public static void setFpsTarget(@OriginalArg(0) int fps) {
-		VARIABLE_RENDER_RATE = 1000.0d / (double)fps;
+		VARIABLE_RENDER_RATE = 1000.0d / (double) fps;
-		VARIABLE_RENDER_RATE_NS = (int)(VARIABLE_RENDER_RATE * 1_000_000.0d);
+		VARIABLE_RENDER_RATE_NS = (int) (VARIABLE_RENDER_RATE * 1_000_000.0d);
 	}
 
 	@OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V")
@@ -446,7 +447,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	private void mainRedrawWrapper() {
 		long now = System.currentTimeMillis();
 		if (now - lastFpsUpdate > 1000) {
-			lastFps[lastFpsIndex++] = 1_000_000_000.0d / (double)renderDelta;
+			lastFps[lastFpsIndex++] = 1_000_000_000.0d / (double) renderDelta;
 			double total = 0.0d;
 			for (int i = 0; i < lastFps.length; ++i) {
 				total += lastFps[i];
@@ -575,7 +576,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 				updateDelta = currentTime - lastUpdateTime;
 				if (updateDelta >= FIXED_UPDATE_RATE_NS) {
-					logicCycles = timer.count(minimumDelay, (int)FIXED_UPDATE_RATE);
+					logicCycles = timer.count(minimumDelay, (int) FIXED_UPDATE_RATE);
 					for (int cycle = 0; cycle < logicCycles; ++cycle) {
 						this.mainLoopWrapper();
 					}
@@ -688,11 +689,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			canvasHeight = 503;
 			frameHeight = 503;
 			@Pc(54) String openWindowJavaScriptStr = this.getParameter("openwinjs");
-			if (openWindowJavaScriptStr != null && openWindowJavaScriptStr.equals("1")) {
+			openWindowJavaScript = openWindowJavaScriptStr != null && openWindowJavaScriptStr.equals("1");
-				openWindowJavaScript = true;
-			} else {
-				openWindowJavaScript = false;
-			}
 			if (signLink == null) {
 				Static69.signLink = signLink = new SignLink(this, cacheId, null, 0);
 			}

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!el")
 public final class GlAlphaSprite extends GlSprite {
 

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

@@ -1,9 +1,10 @@
 package rt4;
 
-import java.nio.ByteBuffer;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!ql")
 public final class GlBuffer {
 

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

@@ -1,6 +1,6 @@
 package rt4;
 
-import com.jogamp.opengl.*;
+import com.jogamp.opengl.GL2;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!mb")
 public final class GlFont extends Font {
 

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!oh")
 public final class GlIndexedSprite extends IndexedSprite {
 

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!td")
 public final class GlModel extends Model {
 
@@ -688,7 +689,7 @@ public final class GlModel extends Model {
 		@Pc(32) float local32 = (float) local3 * arg6[0] + (float) local7 * arg6[1] + (float) local11 * arg6[2];
 		@Pc(53) float local53 = (float) local3 * arg6[3] + (float) local7 * arg6[4] + (float) local11 * arg6[5];
 		@Pc(74) float local74 = (float) local3 * arg6[6] + (float) local7 * arg6[7] + (float) local11 * arg6[8];
-		@Pc(85) float local85 = (float) Math.atan2((double) local32, (double) local74) / 6.2831855F + 0.5F;
+		@Pc(85) float local85 = (float) Math.atan2(local32, local74) / 6.2831855F + 0.5F;
 		if (arg7 != 1.0F) {
 			local85 *= arg7;
 		}
@@ -757,8 +758,8 @@ public final class GlModel extends Model {
 	public static float[] method4097(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float arg4, @OriginalArg(5) float arg5, @OriginalArg(6) float arg6) {
 		@Pc(2) float[] local2 = new float[9];
 		@Pc(5) float[] local5 = new float[9];
-		@Pc(13) float local13 = (float) Math.cos((double) ((float) arg3 * 0.024543693F));
+		@Pc(13) float local13 = (float) Math.cos((float) arg3 * 0.024543693F);
-		@Pc(21) float local21 = (float) Math.sin((double) ((float) arg3 * 0.024543693F));
+		@Pc(21) float local21 = (float) Math.sin((float) arg3 * 0.024543693F);
 		local2[0] = local13;
 		local2[1] = 0.0F;
 		local2[2] = local21;
@@ -772,9 +773,9 @@ public final class GlModel extends Model {
 		@Pc(67) float local67 = 1.0F;
 		@Pc(69) float local69 = 0.0F;
 		@Pc(74) float local74 = (float) arg1 / 32767.0F;
-		@Pc(84) float local84 = -((float) Math.sqrt((double) (1.0F - local74 * local74)));
+		@Pc(84) float local84 = -((float) Math.sqrt(1.0F - local74 * local74));
 		@Pc(88) float local88 = 1.0F - local74;
-		@Pc(99) float local99 = (float) Math.sqrt((double) (arg0 * arg0 + arg2 * arg2));
+		@Pc(99) float local99 = (float) Math.sqrt(arg0 * arg0 + arg2 * arg2);
 		if (local99 == 0.0F && local74 == 0.0F) {
 			local5 = local2;
 		} else {
@@ -821,9 +822,9 @@ public final class GlModel extends Model {
 		@Pc(32) float local32 = (float) local3 * arg6[0] + (float) local7 * arg6[1] + (float) local11 * arg6[2];
 		@Pc(53) float local53 = (float) local3 * arg6[3] + (float) local7 * arg6[4] + (float) local11 * arg6[5];
 		@Pc(74) float local74 = (float) local3 * arg6[6] + (float) local7 * arg6[7] + (float) local11 * arg6[8];
-		@Pc(89) float local89 = (float) Math.sqrt((double) (local32 * local32 + local53 * local53 + local74 * local74));
+		@Pc(89) float local89 = (float) Math.sqrt(local32 * local32 + local53 * local53 + local74 * local74);
-		@Pc(100) float local100 = (float) Math.atan2((double) local32, (double) local74) / 6.2831855F + 0.5F;
+		@Pc(100) float local100 = (float) Math.atan2(local32, local74) / 6.2831855F + 0.5F;
-		@Pc(113) float local113 = (float) Math.asin((double) (local53 / local89)) / 3.1415927F + arg8 + 0.5F;
+		@Pc(113) float local113 = (float) Math.asin(local53 / local89) / 3.1415927F + arg8 + 0.5F;
 		@Pc(118) float local118;
 		if (arg7 == 1) {
 			local118 = local100;
@@ -1002,9 +1003,9 @@ public final class GlModel extends Model {
 				@Pc(247) short local247 = this.vertexBuffer.aShort5;
 				@Pc(251) short local251 = this.vertexBuffer.aShort8;
 				@Pc(255) short local255 = this.vertexBuffer.aShort7;
-				@Pc(290) int[] local290 = new int[] { local243, local247, local243, local247, local243, local247, local243, local247 };
+				@Pc(290) int[] local290 = new int[]{local243, local247, local243, local247, local243, local247, local243, local247};
-				@Pc(325) int[] local325 = new int[] { local251, local251, local255, local255, local251, local251, local255, local255 };
+				@Pc(325) int[] local325 = new int[]{local251, local251, local255, local255, local251, local251, local255, local255};
-				@Pc(360) int[] local360 = new int[] { local17, local17, local17, local17, local21, local21, local21, local21 };
+				@Pc(360) int[] local360 = new int[]{local17, local17, local17, local17, local21, local21, local21, local21};
 				@Pc(362) int local362;
 				@Pc(369) int local369;
 				@Pc(373) int local373;
@@ -1055,7 +1056,8 @@ public final class GlModel extends Model {
 							anIntArray467 = new int[this.anInt5296];
 						}
 						local362 = 0;
-						label118: while (true) {
+						label118:
+						while (true) {
 							if (local362 >= this.vertexCount) {
 								local362 = 0;
 								while (true) {
@@ -1750,7 +1752,7 @@ public final class GlModel extends Model {
 				local446 = local428 + anInt5298;
 				local454 = local434 + anInt5300;
 				local462 = local440 + anInt5299;
-				@Pc(1783) int[] local1783 = new int[] { local343 * arg7[0] + 16384 >> 15, local343 * arg7[3] + 16384 >> 15, local343 * arg7[6] + 16384 >> 15, local365 * arg7[1] + 16384 >> 15, local365 * arg7[4] + 16384 >> 15, local365 * arg7[7] + 16384 >> 15, local387 * arg7[2] + 16384 >> 15, local387 * arg7[5] + 16384 >> 15, local387 * arg7[8] + 16384 >> 15 };
+				@Pc(1783) int[] local1783 = new int[]{local343 * arg7[0] + 16384 >> 15, local343 * arg7[3] + 16384 >> 15, local343 * arg7[6] + 16384 >> 15, local365 * arg7[1] + 16384 >> 15, local365 * arg7[4] + 16384 >> 15, local365 * arg7[7] + 16384 >> 15, local387 * arg7[2] + 16384 >> 15, local387 * arg7[5] + 16384 >> 15, local387 * arg7[8] + 16384 >> 15};
 				local615 = local343 * local230 + 16384 >> 15;
 				local640 = local365 * local45 + 16384 >> 15;
 				local644 = local387 * local53 + 16384 >> 15;
@@ -2110,8 +2112,8 @@ public final class GlModel extends Model {
 		this.vertexBuffer.aShort3 = (short) local9;
 		this.vertexBuffer.aShort8 = (short) local5;
 		this.vertexBuffer.aShort7 = (short) local11;
-		this.vertexBuffer.aShort4 = (short) (Math.sqrt((double) local13) + 0.99D);
+		this.vertexBuffer.aShort4 = (short) (Math.sqrt(local13) + 0.99D);
-		Math.sqrt((double) local15);
+		Math.sqrt(local15);
 		this.vertexBuffer.valid = true;
 	}
 
@@ -2395,7 +2397,7 @@ public final class GlModel extends Model {
 				local60 = (int) FogManager.aFloatArray18[0];
 				local71 = (int) FogManager.aFloatArray18[1];
 				local78 = (int) FogManager.aFloatArray18[2];
-				local85 = (int) Math.sqrt((double) (local60 * local60 + local71 * local71 + local78 * local78));
+				local85 = (int) Math.sqrt(local60 * local60 + local71 * local71 + local78 * local78);
 				local90 = (int) ((float) this.aShort29 * 1.3F);
 				local97 = this.aShort28 * local85 >> 8;
 				for (local99 = 0; local99 < this.anInt5297; local99++) {
@@ -3317,28 +3319,28 @@ public final class GlModel extends Model {
 		if (this.bounds.aClass155_4 != null) {
 			this.bounds.aClass155_4.method4516();
 			local172 = this.bounds.aClass155_4;
-			local1.glVertexPointer(3, GL2.GL_FLOAT, this.bounds.anInt4782, (long) this.bounds.anInt4777);
+			local1.glVertexPointer(3, GL2.GL_FLOAT, this.bounds.anInt4782, this.bounds.anInt4777);
 		}
 		if (this.aClass127_1.aClass155_4 != null) {
 			if (local172 != this.aClass127_1.aClass155_4) {
 				this.aClass127_1.aClass155_4.method4516();
 				local172 = this.aClass127_1.aClass155_4;
 			}
-			local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, (long) this.aClass127_1.anInt4777);
+			local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, this.aClass127_1.anInt4777);
 		}
 		if (Preferences.highDetailLighting && this.aClass127_2.aClass155_4 != null) {
 			if (local172 != this.aClass127_2.aClass155_4) {
 				this.aClass127_2.aClass155_4.method4516();
 				local172 = this.aClass127_2.aClass155_4;
 			}
-			local1.glNormalPointer(GL2.GL_FLOAT, this.aClass127_2.anInt4782, (long) this.aClass127_2.anInt4777);
+			local1.glNormalPointer(GL2.GL_FLOAT, this.aClass127_2.anInt4782, this.aClass127_2.anInt4777);
 		}
 		if (this.aClass127_3.aClass155_4 != null) {
 			if (local172 != this.aClass127_3.aClass155_4) {
 				this.aClass127_3.aClass155_4.method4516();
 				local172 = this.aClass127_3.aClass155_4;
 			}
-			local1.glTexCoordPointer(2, GL2.GL_FLOAT, this.aClass127_3.anInt4782, (long) this.aClass127_3.anInt4777);
+			local1.glTexCoordPointer(2, GL2.GL_FLOAT, this.aClass127_3.anInt4782, this.aClass127_3.anInt4777);
 		}
 		if (this.aClass127_5.aClass155_4 != null) {
 			this.aClass127_5.aClass155_4.method4518();
@@ -3382,7 +3384,7 @@ public final class GlModel extends Model {
 				this.aClass127_5.aByteBuffer8.position(local427 * 12);
 				local1.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, this.aClass127_5.aByteBuffer8);
 			} else {
-				local1.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, (long) (local427 * 12));
+				local1.glDrawElements(GL2.GL_TRIANGLES, (local434 - local427) * 3, GL2.GL_UNSIGNED_INT, local427 * 12);
 			}
 		}
 	}

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.nio.IntBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.IntBuffer;
+
 public final class GlRaster {
 
 	@OriginalMember(owner = "client!dj", name = "b", descriptor = "I")
@@ -191,7 +192,7 @@ public final class GlRaster {
 		@Pc(21) GL2 gl = GlRenderer.gl;
 		gl.glEnable(GL2.GL_SCISSOR_TEST);
 		if (clipLeft <= clipRight && clipTop <= clipBottom) {
-			gl.glScissor((int)(clipLeft * GameShell.canvasScale + GameShell.subpixelX), (int)((GlRenderer.canvasHeight - clipBottom) * GameShell.canvasScale + GameShell.subpixelY), (int)((clipRight - clipLeft) * GameShell.canvasScale + GameShell.subpixelX), (int)((clipBottom - clipTop) * GameShell.canvasScale + GameShell.subpixelY));
+			gl.glScissor((int) (clipLeft * GameShell.canvasScale + GameShell.subpixelX), (int) ((GlRenderer.canvasHeight - clipBottom) * GameShell.canvasScale + GameShell.subpixelY), (int) ((clipRight - clipLeft) * GameShell.canvasScale + GameShell.subpixelX), (int) ((clipBottom - clipTop) * GameShell.canvasScale + GameShell.subpixelY));
 		} else {
 			gl.glScissor(0, 0, 0, 0);
 		}
@@ -256,7 +257,7 @@ public final class GlRaster {
 		@Pc(27) GL2 local27 = GlRenderer.gl;
 		local27.glEnable(GL2.GL_SCISSOR_TEST);
 		if (clipLeft <= clipRight && clipTop <= clipBottom) {
-			local27.glScissor((int)(clipLeft * GameShell.canvasScale + GameShell.subpixelX), (int)((GlRenderer.canvasHeight - clipBottom) * GameShell.canvasScale + GameShell.subpixelY), (int)((clipRight - clipLeft) * GameShell.canvasScale + GameShell.subpixelX), (int)((clipBottom - clipTop) * GameShell.canvasScale + GameShell.subpixelY));
+			local27.glScissor((int) (clipLeft * GameShell.canvasScale + GameShell.subpixelX), (int) ((GlRenderer.canvasHeight - clipBottom) * GameShell.canvasScale + GameShell.subpixelY), (int) ((clipRight - clipLeft) * GameShell.canvasScale + GameShell.subpixelX), (int) ((clipBottom - clipTop) * GameShell.canvasScale + GameShell.subpixelY));
 		} else {
 			local27.glScissor(0, 0, 0, 0);
 		}

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

@@ -1,10 +1,5 @@
 package rt4;
 
-import java.awt.Canvas;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-import java.nio.charset.StandardCharsets;
-
 import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration;
 import com.jogamp.nativewindow.awt.JAWTWindow;
 import com.jogamp.opengl.*;
@@ -13,6 +8,11 @@ import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.*;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+import java.nio.charset.StandardCharsets;
+
 public final class GlRenderer {
 
 	@OriginalMember(owner = "client!tf", name = "a", descriptor = "Ljava/lang/String;")
@@ -767,7 +767,7 @@ public final class GlRenderer {
 		@Pc(23) float local23 = (float) arg2 / 512.0F;
 		@Pc(30) float local30 = local23 * (256.0F / (float) arg4);
 		@Pc(37) float local37 = local23 * (256.0F / (float) arg5);
-		gl.glOrtho((double) ((float) local2 * local30), (double) ((float) local6 * local30), (double) ((float) -local13 * local37), (double) ((float) -local9 * local37), (double) (50 - arg3), (double) (GlobalConfig.VIEW_DISTANCE - arg3));
+		gl.glOrtho((float) local2 * local30, (float) local6 * local30, (float) -local13 * local37, (float) -local9 * local37, 50 - arg3, GlobalConfig.VIEW_DISTANCE - arg3);
 		setViewportBounds(0, 0, canvasWidth, canvasHeight);
 		gl.glMatrixMode(GL2.GL_MODELVIEW);
 		gl.glLoadIdentity();
@@ -807,7 +807,7 @@ public final class GlRenderer {
 		gl.glGenTextures(1, local2, 0);
 		anInt5328 = local2[0];
 		gl.glBindTexture(GL2.GL_TEXTURE_2D, anInt5328);
-		gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, 4, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(new int[] { -1 }));
+		gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, 4, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(new int[]{-1}));
 		LightingManager.method2401();
 		MaterialManager.init();
 	}

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!sd")
 public final class GlSolidColorTexture extends SecondaryNode {
 
@@ -28,7 +29,7 @@ public final class GlSolidColorTexture extends SecondaryNode {
 		this.anInt5059 = GlCleaner.contextId;
 		GlRenderer.setTextureId(this.anInt5058);
 		@Pc(32) int local32 = Rasteriser.palette[arg0];
-		@Pc(58) byte[] local58 = new byte[] { (byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1 };
+		@Pc(58) byte[] local58 = new byte[]{(byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1};
 		@Pc(61) ByteBuffer local61 = ByteBuffer.wrap(local58);
 		local9.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local61);
 		local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR);

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!cf")
 public class GlSprite extends Sprite {
 

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!uh")
 public final class GlTexture extends SecondaryNode {
 
@@ -86,7 +87,7 @@ public final class GlTexture extends SecondaryNode {
 				return null;
 			}
 			@Pc(36) int local36 = arg3 ? 64 : 128;
-			this.anIntArray481 = this.aClass88_1.method2725(local36, this.aBoolean288, local36, (double) arg1, arg2, arg0, true);
+			this.anIntArray481 = this.aClass88_1.method2725(local36, this.aBoolean288, local36, arg1, arg2, arg0, true);
 			this.aFloat35 = arg1;
 			if (this.aBoolean286) {
 				@Pc(62) int[] local62 = new int[local36];

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

@@ -1,13 +1,14 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import java.nio.ByteOrder;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
 @OriginalClass("client!hg")
 public final class GlTile extends Node {
 

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!vi")
 public final class GlVertexBufferObject {
 

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.util.zip.Inflater;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.util.zip.Inflater;
+
 @OriginalClass("client!ha")
 public final class GzipDecompressor {
 

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

@@ -24,7 +24,7 @@ public final class IdkType {
 	private int[] bodyModels;
 
 	@OriginalMember(owner = "client!dm", name = "x", descriptor = "[I")
-	private final int[] headModels = new int[] { -1, -1, -1, -1, -1 };
+	private final int[] headModels = new int[]{-1, -1, -1, -1, -1};
 
 	@OriginalMember(owner = "client!dm", name = "k", descriptor = "I")
 	public int feature = -1;

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

@@ -23,7 +23,7 @@ public class IdkTypeList {
 
 	@OriginalMember(owner = "client!gg", name = "d", descriptor = "(II)Lclient!dm;")
 	public static IdkType get(@OriginalArg(0) int arg0) {
-		@Pc(10) IdkType local10 = (IdkType) types.get((long) arg0);
+		@Pc(10) IdkType local10 = (IdkType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -32,7 +32,7 @@ public class IdkTypeList {
 		if (local21 != null) {
 			local10.decode(new Buffer(local21));
 		}
-		types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -38,13 +38,13 @@ public class IgnoreList {
 		@Pc(36) int local36;
 		for (local36 = 0; local36 < size; local36++) {
 			if (encodedUsernames[local36] == arg0) {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
+				Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[]{local34, LocalizedText.IGNORELISTDUPE}));
 				return;
 			}
 		}
 		for (local36 = 0; local36 < FriendsList.size; local36++) {
 			if (FriendsList.encodedUsernames[local36] == arg0) {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
+				Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[]{LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
 				return;
 			}
 		}

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

@@ -1,20 +1,14 @@
 package rt4;
 
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.image.ColorModel;
-import java.awt.image.DirectColorModel;
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageObserver;
-import java.awt.image.ImageProducer;
-
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.Component;
+import java.awt.*;
+import java.awt.image.*;
+
 @OriginalClass("client!di")
 public final class ImageProducerFrameBuffer extends FrameBuffer implements ImageProducer, ImageObserver {
 

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

@@ -224,7 +224,7 @@ public class InterfaceList {
 		if (!getServerActiveProperties(arg0).method503(arg1) && arg0.onOptionClick == null) {
 			return null;
 		} else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) {
-            return Static121.qaOpTest ? JagString.concatenate(new JagString[] { aClass100_903, JagString.parseInt(arg1) }) : null;
+			return Static121.qaOpTest ? JagString.concatenate(new JagString[]{aClass100_903, JagString.parseInt(arg1)}) : null;
 		} else {
 			return arg0.ops[arg1];
 		}
@@ -278,7 +278,7 @@ public class InterfaceList {
 		if (arg0.createdComponents != null) {
 			method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);
 		}
-        @Pc(66) ComponentPointer local66 = (ComponentPointer) openInterfaces.get((long) arg0.id);
+		@Pc(66) ComponentPointer local66 = (ComponentPointer) openInterfaces.get(arg0.id);
 		if (local66 != null) {
 			method4017(local32, arg1, local66.anInt5878, local20);
 		}
@@ -535,7 +535,7 @@ public class InterfaceList {
 					if (local23.createdComponents != null) {
 						method7(local23.createdComponents, arg1);
 					}
-                    @Pc(49) ComponentPointer local49 = (ComponentPointer) openInterfaces.get((long) local23.id);
+					@Pc(49) ComponentPointer local49 = (ComponentPointer) openInterfaces.get(local23.id);
 					if (local49 != null) {
 						runScripts(arg1, local49.anInt5878);
 					}
@@ -624,19 +624,9 @@ public class InterfaceList {
 					}
 					if (component.if3) {
 						@Pc(207) boolean local207;
-                        if (Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) {
+						local207 = Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67;
-                            local207 = true;
+						@Pc(212) boolean local212 = Mouse.pressedButton == 1 && local207;
-                        } else {
+						@Pc(221) boolean local221 = Mouse.clickButton == 1 && Mouse.clickX >= local61 && Mouse.clickY >= local63 && Mouse.clickX < local65 && Mouse.clickY < local67;
-                            local207 = false;
-                        }
-                        @Pc(212) boolean local212 = false;
-                        if (Mouse.pressedButton == 1 && local207) {
-                            local212 = true;
-                        }
-                        @Pc(221) boolean local221 = false;
-                        if (Mouse.clickButton == 1 && Mouse.clickX >= local61 && Mouse.clickY >= local63 && Mouse.clickX < local65 && Mouse.clickY < local67) {
-                            local221 = true;
-                        }
 						@Pc(243) int i;
 						@Pc(322) int k;
 						if (component.aByteArray8 != null) {
@@ -838,7 +828,8 @@ public class InterfaceList {
 									request.arguments = component.onVarcTransmit;
 									lowPriorityRequests.addTail(request);
 								} else {
-                                    label563: for (i = component.updatedVarcsReaderIndex; i < VarcDomain.updatedVarcsWriterIndex; i++) {
+									label563:
+									for (i = component.updatedVarcsReaderIndex; i < VarcDomain.updatedVarcsWriterIndex; i++) {
 										skill = VarcDomain.updatedVarcs[i & 0x1F];
 										for (k = 0; k < component.varcTriggers.length; k++) {
 											if (component.varcTriggers[k] == skill) {
@@ -860,7 +851,8 @@ public class InterfaceList {
 									request.arguments = component.onVarcstrTransmit;
 									lowPriorityRequests.addTail(request);
 								} else {
-                                    label539: for (i = component.updatedVarcstrsReaderIndex; i < VarcDomain.updatedVarcstrsWriterIndex; i++) {
+									label539:
+									for (i = component.updatedVarcstrsReaderIndex; i < VarcDomain.updatedVarcstrsWriterIndex; i++) {
 										skill = VarcDomain.updatedVarcstrs[i & 0x1F];
 										for (k = 0; k < component.varcstrTriggers.length; k++) {
 											if (component.varcstrTriggers[k] == skill) {
@@ -882,7 +874,8 @@ public class InterfaceList {
 									request.arguments = component.onVarpTransmit;
 									lowPriorityRequests.addTail(request);
 								} else {
-                                    label515: for (i = component.updatedVarpsReaderIndex; i < VarpDomain.updatedVarpsWriterIndex; i++) {
+									label515:
+									for (i = component.updatedVarpsReaderIndex; i < VarpDomain.updatedVarpsWriterIndex; i++) {
 										skill = VarpDomain.updatedVarps[i & 0x1F];
 										for (k = 0; k < component.varpTriggers.length; k++) {
 											if (component.varpTriggers[k] == skill) {
@@ -1012,7 +1005,7 @@ public class InterfaceList {
 						if (component.createdComponents != null) {
 							method946(component.createdComponents, component.id, local61, local63, local65, local67, local50 - component.scrollX, local55 - component.scrollY);
 						}
-                        @Pc(1595) ComponentPointer local1595 = (ComponentPointer) openInterfaces.get((long) component.id);
+						@Pc(1595) ComponentPointer local1595 = (ComponentPointer) openInterfaces.get(component.id);
 						if (local1595 != null) {
 							method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67);
 						}

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

@@ -23,17 +23,17 @@ public final class Inv extends Node {
 	@OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;")
 	public static HashTable objectContainerCache = new HashTable(32);
 	@OriginalMember(owner = "client!qe", name = "p", descriptor = "[I")
-	public int[] objectIds = new int[] { -1 };
+	public int[] objectIds = new int[]{-1};
 
 	@OriginalMember(owner = "client!qe", name = "u", descriptor = "[I")
-	public int[] anIntArray422 = new int[] { 0 };
+	public int[] anIntArray422 = new int[]{0};
 
 	@OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I")
 	public static int getFreeSpace(@OriginalArg(0) int arg0) {
 		if (arg0 < 0) {
 			return 0;
 		}
-        @Pc(17) Inv local17 = (Inv) objectContainerCache.get((long) arg0);
+		@Pc(17) Inv local17 = (Inv) objectContainerCache.get(arg0);
 		if (local17 == null) {
 			return InvTypeList.get(arg0).size;
 		}
@@ -48,7 +48,7 @@ public final class Inv extends Node {
 
 	@OriginalMember(owner = "client!od", name = "a", descriptor = "(IZII)I")
 	public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-        @Pc(19) Inv local19 = (Inv) objectContainerCache.get((long) arg1);
+		@Pc(19) Inv local19 = (Inv) objectContainerCache.get(arg1);
 		if (local19 == null) {
 			return 0;
 		}
@@ -57,7 +57,7 @@ public final class Inv extends Node {
 			if (local19.objectIds[local29] >= 0 && ObjTypeList.anInt3245 > local19.objectIds[local29]) {
 				@Pc(56) ObjType local56 = ObjTypeList.get(local19.objectIds[local29]);
 				if (local56.params != null) {
-                    @Pc(68) IntNode local68 = (IntNode) local56.params.get((long) arg2);
+					@Pc(68) IntNode local68 = (IntNode) local56.params.get(arg2);
 					if (local68 != null) {
 						if (arg0) {
 							local27 += local19.anIntArray422[local29] * local68.value;
@@ -73,7 +73,7 @@ public final class Inv extends Node {
 
 	@OriginalMember(owner = "client!wj", name = "a", descriptor = "(BII)I")
 	public static int getSlotTotal(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-        @Pc(8) Inv local8 = (Inv) objectContainerCache.get((long) arg0);
+		@Pc(8) Inv local8 = (Inv) objectContainerCache.get(arg0);
 		if (local8 == null) {
 			return 0;
 		} else if (arg1 == -1) {
@@ -91,7 +91,7 @@ public final class Inv extends Node {
 
 	@OriginalMember(owner = "client!bm", name = "a", descriptor = "(III)I")
 	public static int getItemCount(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-        @Pc(10) Inv local10 = (Inv) objectContainerCache.get((long) arg0);
+		@Pc(10) Inv local10 = (Inv) objectContainerCache.get(arg0);
 		if (local10 == null) {
 			return 0;
 		} else if (arg1 >= 0 && arg1 < local10.anIntArray422.length) {
@@ -103,7 +103,7 @@ public final class Inv extends Node {
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")
 	public static int getItemType(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-        @Pc(10) Inv local10 = (Inv) objectContainerCache.get((long) arg0);
+		@Pc(10) Inv local10 = (Inv) objectContainerCache.get(arg0);
 		if (local10 == null) {
 			return -1;
 		} else if (arg1 >= 0 && arg1 < local10.objectIds.length) {
@@ -115,7 +115,7 @@ public final class Inv extends Node {
 
 	@OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V")
 	public static void delete(@OriginalArg(0) int arg0) {
-        @Pc(14) Inv local14 = (Inv) objectContainerCache.get((long) arg0);
+		@Pc(14) Inv local14 = (Inv) objectContainerCache.get(arg0);
 		if (local14 != null) {
 			local14.unlink();
 		}
@@ -128,10 +128,10 @@ public final class Inv extends Node {
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIIIB)V")
 	public static void updateContainer(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-        @Pc(12) Inv local12 = (Inv) objectContainerCache.get((long) arg3);
+		@Pc(12) Inv local12 = (Inv) objectContainerCache.get(arg3);
 		if (local12 == null) {
 			local12 = new Inv();
-            objectContainerCache.put(local12, (long) arg3);
+			objectContainerCache.put(local12, arg3);
 		}
 		if (arg1 >= local12.objectIds.length) {
 			@Pc(39) int[] local39 = new int[arg1 + 1];
@@ -263,17 +263,17 @@ public final class Inv extends Node {
 	@OriginalMember(owner = "client!eb", name = "b", descriptor = "(II)Lclient!na;")
 	public static JagString formatObjAmount(@OriginalArg(1) int arg0) {
 		if (arg0 < 100000) {
-            return JagString.concatenate(new JagString[] { aClass100_559, JagString.parseInt(arg0), aClass100_594 });
+			return JagString.concatenate(new JagString[]{aClass100_559, JagString.parseInt(arg0), aClass100_594});
 		} else if (arg0 >= 10000000) {
-            return JagString.concatenate(new JagString[] { aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, aClass100_594 });
+			return JagString.concatenate(new JagString[]{aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, aClass100_594});
 		} else {
-            return JagString.concatenate(new JagString[] { aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, aClass100_594 });
+			return JagString.concatenate(new JagString[]{aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, aClass100_594});
 		}
 	}
 
 	@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
 	public static void method475(@OriginalArg(1) int arg0) {
-        @Pc(8) Inv local8 = (Inv) objectContainerCache.get((long) arg0);
+		@Pc(8) Inv local8 = (Inv) objectContainerCache.get(arg0);
 		if (local8 != null) {
 			for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) {
 				local8.objectIds[local24] = -1;

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

@@ -17,7 +17,7 @@ public class InvTypeList {
 
 	@OriginalMember(owner = "client!u", name = "a", descriptor = "(II)Lclient!md;")
 	public static InvType get(@OriginalArg(0) int id) {
-        @Pc(16) InvType invType = (InvType) types.get((long) id);
+		@Pc(16) InvType invType = (InvType) types.get(id);
 		if (invType != null) {
 			return invType;
 		}
@@ -26,7 +26,7 @@ public class InvTypeList {
 		if (data != null) {
 			invType.decode(new Buffer(data));
 		}
-        types.put(invType, (long) id);
+		types.put(invType, id);
 		return invType;
 	}
 }

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

@@ -1,17 +1,16 @@
 package rt4;
 
-import java.applet.Applet;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.applet.Applet;
+import java.awt.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
 @OriginalClass("client!na")
 public final class JagString implements StringInterface {
 
@@ -36,7 +35,7 @@ public final class JagString implements StringInterface {
 	@OriginalMember(owner = "client!bm", name = "p", descriptor = "Lclient!na;")
 	public static final JagString aClass100_133 = parse("(U1");
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "[I")
-	public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 };
+	public static final int[] anIntArray471 = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178};
 	@OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
 	public static final JagString aClass100_967 = parse("");
 	@OriginalMember(owner = "client!li", name = "w", descriptor = "Lclient!sc;")
@@ -216,7 +215,7 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
 	public static JagString formatIp(@OriginalArg(0) int arg0) {
-        return concatenate(new JagString[] { parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF) });
+		return concatenate(new JagString[]{parseInt(arg0 >> 24 & 0xFF), aClass100_994, parseInt(arg0 >> 16 & 0xFF), aClass100_994, parseInt(arg0 >> 8 & 0xFF), aClass100_994, parseInt(arg0 & 0xFF)});
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
@@ -252,22 +251,22 @@ public final class JagString implements StringInterface {
 															local246 = decodeString(local265, local265.length, 0);
 														}
 													}
-													arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
+													arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), local246, arg1.substring(local14 + 4)});
 												}
 											}
-											arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(4, arg0)), arg1.substring(local14 + 2) });
+											arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(4, arg0)), arg1.substring(local14 + 2)});
 										}
 									}
-									arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(3, arg0)), arg1.substring(local14 + 2) });
+									arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(3, arg0)), arg1.substring(local14 + 2)});
 								}
 							}
-							arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(2, arg0)), arg1.substring(local14 + 2) });
+							arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(2, arg0)), arg1.substring(local14 + 2)});
 						}
 					}
-					arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(1, arg0)), arg1.substring(local14 + 2) });
+					arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(1, arg0)), arg1.substring(local14 + 2)});
 				}
 			}
-			arg1 = concatenate(new JagString[] { arg1.substring(local14, 0), StringUtils.method4510(method3212(0, arg0)), arg1.substring(local14 + 2) });
+			arg1 = concatenate(new JagString[]{arg1.substring(local14, 0), StringUtils.method4510(method3212(0, arg0)), arg1.substring(local14 + 2)});
 		}
 	}
 

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

@@ -1,15 +1,16 @@
 package rt4;
 
-import java.awt.Component;
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
+import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
+
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.Mixer.Info;
 import javax.sound.sampled.SourceDataLine;
-import org.openrs2.deob.annotation.OriginalArg;
+import java.awt.Component;
-import org.openrs2.deob.annotation.OriginalClass;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!qa")
 public final class JavaAudioChannel extends AudioChannel {

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

@@ -1,13 +1,14 @@
 package rt4;
 
-import java.awt.Component;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.Component;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+
 import static rt4.MathUtils.clamp;
 
 @OriginalClass("client!o")
@@ -38,7 +39,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen
 		int diff = this.anInt4233 - previous;
 
 		if (((GlobalJsonConfig.instance != null && GlobalJsonConfig.instance.mouseWheelZoom) || (GlobalJsonConfig.instance == null && GlobalConfig.MOUSEWHEEL_ZOOM)) && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
-			Camera.ZOOM = clamp(200, 1200, Camera.ZOOM + (diff >= 0 ? 50: -50));
+			Camera.ZOOM = clamp(200, 1200, Camera.ZOOM + (diff >= 0 ? 50 : -50));
 		}
 	}
 

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

@@ -296,7 +296,7 @@ public final class Js5 {
 				uncompressed = Js5Compression.uncompress(compressed);
 			} catch (@Pc(142) RuntimeException ex) {
 				System.out.println("T3 - " + (key != null) + "," + group + "," + compressed.length + "," + Buffer.crc32(compressed, compressed.length) + "," + Buffer.crc32(compressed, compressed.length - 2) + "," + this.index.groupChecksums[group] + "," + this.index.checksum);
-				uncompressed = new byte[] { 0 };
+				uncompressed = new byte[]{0};
 			}
 			if (this.discardPacked) {
 				this.packed[group] = null;

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

@@ -305,7 +305,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 	@OriginalMember(owner = "client!bg", name = "b", descriptor = "(II)I")
 	@Override
 	public final int getPercentageComplete(@OriginalArg(0) int arg0) {
-		@Pc(15) Js5Request request = (Js5Request) this.requests.get((long) arg0);
+		@Pc(15) Js5Request request = (Js5Request) this.requests.get(arg0);
 		return request == null ? 0 : request.getPercentageComplete();
 	}
 
@@ -316,7 +316,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 
 	@OriginalMember(owner = "client!bg", name = "a", descriptor = "(III)Lclient!il;")
 	private Js5Request fetchGroupInner(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(13) Js5Request local13 = (Js5Request) this.requests.get((long) arg1);
+		@Pc(13) Js5Request local13 = (Js5Request) this.requests.get(arg1);
 		if (local13 != null && arg0 == 0 && !local13.urgent && local13.incomplete) {
 			local13.unlink();
 			local13 = null;
@@ -350,7 +350,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			} else {
 				throw new RuntimeException();
 			}
-			this.requests.put(local13, (long) arg1);
+			this.requests.put(local13, arg1);
 		}
 		if (local13.incomplete) {
 			return null;
@@ -376,7 +376,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				local13.unlink();
 				if (local13.urgent && !this.netQueue.isUrgentRequestQueueFull()) {
 					local252 = this.netQueue.read(this.archive, (byte) 2, arg1, true);
-					this.requests.put(local252, (long) arg1);
+					this.requests.put(local252, arg1);
 				}
 				return null;
 			}
@@ -423,7 +423,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			local13.unlink();
 			if (local13.urgent && !this.netQueue.isUrgentRequestQueueFull()) {
 				local252 = this.netQueue.read(this.archive, (byte) 2, arg1, true);
-				this.requests.put(local252, (long) arg1);
+				this.requests.put(local252, arg1);
 			}
 			return null;
 		}

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

@@ -166,7 +166,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
 
 	@OriginalMember(owner = "client!nk", name = "i", descriptor = "(II)Lclient!uh;")
 	private GlTexture method3242(@OriginalArg(0) int arg0) {
-		@Pc(14) GlTexture local14 = (GlTexture) this.glTextures.get((long) arg0);
+		@Pc(14) GlTexture local14 = (GlTexture) this.glTextures.get(arg0);
 		if (local14 != null) {
 			return local14;
 		}
@@ -176,7 +176,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
 		} else {
 			@Pc(41) Buffer local41 = new Buffer(local30);
 			local14 = new GlTexture(local41);
-			this.glTextures.put(local14, (long) arg0);
+			this.glTextures.put(local14, arg0);
 			return local14;
 		}
 	}
@@ -207,10 +207,10 @@ public final class Js5GlTextureProvider implements TextureProvider {
 
 	@OriginalMember(owner = "client!nk", name = "j", descriptor = "(II)Lclient!sd;")
 	private GlSolidColorTexture method3244(@OriginalArg(1) int arg0) {
-		@Pc(19) GlSolidColorTexture local19 = (GlSolidColorTexture) this.solidColorSprites.get((long) arg0);
+		@Pc(19) GlSolidColorTexture local19 = (GlSolidColorTexture) this.solidColorSprites.get(arg0);
 		if (local19 == null) {
 			local19 = new GlSolidColorTexture(this.aShortArray59[arg0] & 0xFFFF);
-			this.solidColorSprites.put(local19, (long) arg0);
+			this.solidColorSprites.put(local19, arg0);
 			return local19;
 		} else {
 			return local19;
@@ -221,7 +221,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
 	@Override
 	public final boolean method3230(@OriginalArg(1) int arg0) {
 		@Pc(15) GlTexture local15 = this.method3242(arg0);
-		return local15 == null ? false : local15.method4299(this, this.aClass153_72);
+		return local15 != null && local15.method4299(this, this.aClass153_72);
 	}
 
 	@OriginalMember(owner = "client!nk", name = "b", descriptor = "(ZI)V")

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.io.IOException;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.io.IOException;
+
 @OriginalClass("client!jb")
 public final class Js5NetQueue {
 
@@ -155,7 +156,7 @@ public final class Js5NetQueue {
 							@Pc(476) int local476 = this.inBuffer.g4();
 							@Pc(480) int local480 = local471 & 0x7F;
 							@Pc(491) boolean local491 = (local471 & 0x80) != 0;
-							@Pc(501) long local501 = (long) ((local235 << 16) + local283);
+							@Pc(501) long local501 = (local235 << 16) + local283;
 							@Pc(509) Js5NetRequest local509;
 							if (local491) {
 								for (local509 = (Js5NetRequest) this.inFlightPrefetchRequests.head(); local509 != null && local509.secondaryKey != local501; local509 = (Js5NetRequest) this.inFlightPrefetchRequests.next()) {

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

@@ -1,5 +1,10 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalClass;
+import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
+
 import java.awt.Component;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -8,11 +13,6 @@ import java.awt.event.KeyListener;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalClass;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
 @OriginalClass("client!uf")
 public final class Keyboard implements KeyListener, FocusListener {
 

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

@@ -15,7 +15,7 @@ public final class LangUtils {
 	@OriginalMember(owner = "client!mc", name = "pb", descriptor = "Lclient!na;")
 	private static final JagString LANG_FR = JagString.parse("fr");
 	@OriginalMember(owner = "client!mc", name = "ob", descriptor = "[Lclient!na;")
-	public static final JagString[] LANGUAGES = new JagString[] {LANG_EN, LANG_DE, LANG_FR, LANG_PT};
+	public static final JagString[] LANGUAGES = new JagString[]{LANG_EN, LANG_DE, LANG_FR, LANG_PT};
 
 	@OriginalMember(owner = "client!hm", name = "a", descriptor = "(Lclient!na;B)I")
 	public static int method2053(@OriginalArg(0) JagString arg0) {

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

@@ -17,7 +17,7 @@ public class LightTypeList {
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(II)Lclient!ic;")
 	public static LightType get(@OriginalArg(1) int arg0) {
-        @Pc(10) LightType local10 = (LightType) types.get((long) arg0);
+		@Pc(10) LightType local10 = (LightType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -26,7 +26,7 @@ public class LightTypeList {
 		if (local26 != null) {
 			local10.decode(new Buffer(local26), arg0);
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -1,12 +1,13 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+
 @OriginalClass("client!fj")
 public final class Light_Class45 {
 
@@ -72,7 +73,7 @@ public final class Light_Class45 {
 		@Pc(37) float local37 = (float) (arg0.x - arg1);
 		@Pc(43) float local43 = (float) (arg0.y - arg2);
 		@Pc(49) float local49 = (float) (arg0.z - arg3);
-		@Pc(64) float local64 = (float) Math.sqrt((double) (local37 * local37 + local43 * local43 + local49 * local49));
+		@Pc(64) float local64 = (float) Math.sqrt(local37 * local37 + local43 * local43 + local49 * local49);
 		@Pc(68) float local68 = 1.0F / local64;
 		@Pc(72) float local72 = local37 * local68;
 		@Pc(76) float local76 = local43 * local68;

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

@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public class LightingManager {
 	@OriginalMember(owner = "client!jf", name = "b", descriptor = "[F")
-    private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
+	private static final float[] aFloatArray17 = new float[]{0.0F, 0.0F, 0.0F, 1.0F};
 	@OriginalMember(owner = "client!jf", name = "l", descriptor = "I")
 	public static int lightCount = 0;
 	@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
@@ -103,12 +103,15 @@ public class LightingManager {
 		@Pc(33) int local33 = 0;
 		@Pc(35) int local35;
 		@Pc(40) int local40;
-        label112: for (local35 = arg4; local35 <= arg6; local35++) {
+		label112:
-            label110: for (local40 = arg5; local40 <= arg7; local40++) {
+		for (local35 = arg4; local35 <= arg6; local35++) {
+			label110:
+			for (local40 = arg5; local40 <= arg7; local40++) {
 				@Pc(51) int local51 = anIntArrayArrayArray11[arg3][local35][local40];
 				while (true) {
 					while (true) {
-                        label96: while (true) {
+						label96:
+						while (true) {
 							if (local51 == 0) {
 								continue label110;
 							}
@@ -187,7 +190,8 @@ public class LightingManager {
 		while (true) {
 			@Pc(47) int local47;
 			@Pc(53) int local53;
-            label72: while (local39 != 0) {
+			label72:
+			while (local39 != 0) {
 				local47 = (local39 & 0xFF) - 1;
 				local39 >>>= 0x8;
 				for (local53 = 0; local53 < 4; local53++) {
@@ -300,7 +304,8 @@ public class LightingManager {
 		if (!Preferences.highDetailLighting) {
 			return;
 		}
-        label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
+		label43:
+		for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
 			if (anIntArray284[local4] != -1) {
 				@Pc(20) int local20 = anIntArrayArrayArray11[arg0][arg1][arg2];
 				@Pc(28) int local28;
@@ -341,7 +346,7 @@ public class LightingManager {
 		@Pc(3) int local3;
 		for (local3 = 0; local3 < 4; local3++) {
 			@Pc(10) int local10 = local3 + 16388;
-            local1.glLightfv(local10, GL2.GL_AMBIENT, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
+			local1.glLightfv(local10, GL2.GL_AMBIENT, new float[]{0.0F, 0.0F, 0.0F, 1.0F}, 0);
 			local1.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F);
 			local1.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F);
 		}
@@ -374,10 +379,11 @@ public class LightingManager {
 		gl.glDepthMask(false);
 		GlRenderer.setLightingEnabled(false);
 		gl.glBlendFunc(GL2.GL_DST_COLOR, GL2.GL_ONE);
-        gl.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
+		gl.glFogfv(GL2.GL_FOG_COLOR, new float[]{0.0F, 0.0F, 0.0F, 0.0F}, 0);
 		gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
 		gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
-        label71: for (@Pc(56) int local56 = 0; local56 < lightCount; local56++) {
+		label71:
+		for (@Pc(56) int local56 = 0; local56 < lightCount; local56++) {
 			@Pc(63) Light local63 = lights[local56];
 			@Pc(66) int local66 = local63.level;
 			if (local63.aBoolean125) {
@@ -411,7 +417,7 @@ public class LightingManager {
 						}
 						if (local66 < 0 || local160 != null && local160.aBoolean45) {
 							GlRenderer.method4159(201.5F - (float) local63.level * 50.0F - 1.5F);
-                            gl.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[] { 0.0F, 0.0F, 0.0F, local63.alpha}, 0);
+							gl.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[]{0.0F, 0.0F, 0.0F, local63.alpha}, 0);
 							local63.aClass45_1.method1556();
 							continue label71;
 						}

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

@@ -1,14 +1,15 @@
 package rt4;
 
-import java.nio.ByteBuffer;
+import com.jogamp.opengl.GL2;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import com.jogamp.opengl.*;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
 @OriginalClass("client!rd")
 public final class LiquidMaterialRenderer implements MaterialRenderer {
 

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

@@ -4,8 +4,8 @@ import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
-import java.awt.*;
 import java.awt.Font;
+import java.awt.*;
 
 public class LoadingBarAwt {
 	@OriginalMember(owner = "client!tg", name = "a", descriptor = "Ljava/awt/FontMetrics;")

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

@@ -9,7 +9,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Loc extends Entity {
 
 	@OriginalMember(owner = "client!kf", name = "h", descriptor = "[I")
-	public static final int[] LAYERS = new int[] { 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3 };
+	public static final int[] LAYERS = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3};
 	@OriginalMember(owner = "client!ci", name = "q", descriptor = "Lclient!ek;")
 	public static SoftwareIndexedSprite aClass36_Sub1_1 = null;
 	@OriginalMember(owner = "client!dc", name = "U", descriptor = "Lclient!ga;")

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

@@ -251,7 +251,7 @@ public final class LocType {
 				if (local10) {
 					local60 += 65536;
 				}
-				local7 = (RawModel) LocTypeList.aClass99_24.get((long) local60);
+				local7 = (RawModel) LocTypeList.aClass99_24.get(local60);
 				if (local7 == null) {
 					local7 = RawModel.create(LocTypeList.modelsArchive, local60 & 0xFFFF);
 					if (local7 == null) {
@@ -260,7 +260,7 @@ public final class LocType {
 					if (local10) {
 						local7.method1673();
 					}
-					LocTypeList.aClass99_24.put(local7, (long) local60);
+					LocTypeList.aClass99_24.put(local7, local60);
 				}
 				if (local46 > 1) {
 					tempModels[local48] = local7;
@@ -284,7 +284,7 @@ public final class LocType {
 			if (local10) {
 				local48 += 65536;
 			}
-			local7 = (RawModel) LocTypeList.aClass99_24.get((long) local48);
+			local7 = (RawModel) LocTypeList.aClass99_24.get(local48);
 			if (local7 == null) {
 				local7 = RawModel.create(LocTypeList.modelsArchive, local48 & 0xFFFF);
 				if (local7 == null) {
@@ -293,21 +293,13 @@ public final class LocType {
 				if (local10) {
 					local7.method1673();
 				}
-				LocTypeList.aClass99_24.put(local7, (long) local48);
+				LocTypeList.aClass99_24.put(local7, local48);
 			}
 		}
 		@Pc(211) boolean local211;
-		if (this.resizeX == 128 && this.resizeY == 128 && this.resizeZ == 128) {
+		local211 = this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128;
-			local211 = false;
-		} else {
-			local211 = true;
-		}
 		@Pc(230) boolean local230;
-		if (this.translateX == 0 && this.translateY == 0 && this.translateZ == 0) {
+		local230 = this.translateX != 0 || this.translateY != 0 || this.translateZ != 0;
-			local230 = false;
-		} else {
-			local230 = true;
-		}
 		@Pc(265) RawModel local265 = new RawModel(local7, arg0 == 0 && !local211 && !local230, this.recolorSource == null, this.retextureSource == null, true);
 		if (arg1 == 4 && arg0 > 3) {
 			local265.method1682();
@@ -385,7 +377,7 @@ public final class LocType {
 		if (this.params == null) {
 			return arg0;
 		} else {
-			@Pc(21) IntNode local21 = (IntNode) this.params.get((long) arg1);
+			@Pc(21) IntNode local21 = (IntNode) this.params.get(arg1);
 			return local21 == null ? arg0 : local21.value;
 		}
 	}
@@ -605,7 +597,7 @@ public final class LocType {
 				} else {
 					local589 = new IntNode(arg0.g4());
 				}
-				this.params.put(local589, (long) local580);
+				this.params.put(local589, local580);
 			}
 		}
 	}
@@ -681,14 +673,14 @@ public final class LocType {
 			if (arg1) {
 				local26 += 65536;
 			}
-			local79 = (GlModel) LocTypeList.aClass99_24.get((long) local26);
+			local79 = (GlModel) LocTypeList.aClass99_24.get(local26);
 			if (local79 == null) {
 				@Pc(90) RawModel local90 = RawModel.create(LocTypeList.modelsArchive, local26 & 0xFFFF);
 				if (local90 == null) {
 					return null;
 				}
 				local79 = new GlModel(local90, local10, local17, arg1);
-				LocTypeList.aClass99_24.put(local79, (long) local26);
+				LocTypeList.aClass99_24.put(local79, local26);
 			}
 		}
 		@Pc(236) boolean local236 = this.aBoolean217;
@@ -918,7 +910,7 @@ public final class LocType {
 		if (this.params == null) {
 			return arg0;
 		} else {
-			@Pc(26) StringNode local26 = (StringNode) this.params.get((long) arg1);
+			@Pc(26) StringNode local26 = (StringNode) this.params.get(arg1);
 			return local26 == null ? arg0 : local26.value;
 		}
 	}

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

@@ -22,7 +22,7 @@ public class LocTypeList {
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;")
 	public static LocType get(@OriginalArg(1) int id) {
-        @Pc(15) LocType local15 = (LocType) types.get((long) id);
+		@Pc(15) LocType local15 = (LocType) types.get(id);
 		if (local15 != null) {
 			return local15;
 		}
@@ -40,7 +40,7 @@ public class LocTypeList {
 			local15.anInt4435 = 0;
 			local15.aBoolean207 = false;
 		}
-        types.put(local15, (long) id);
+		types.put(local15, id);
 		return local15;
 	}
 

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

@@ -29,7 +29,7 @@ public class LoginManager {
 	@OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_64 = new LinkedList();
 	@OriginalMember(owner = "client!gd", name = "h", descriptor = "[I")
-    public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 };
+	public static final int[] anIntArray204 = new int[]{16, 32, 64, 128};
 	@OriginalMember(owner = "client!rl", name = "X", descriptor = "I")
 	public static int anInt4937 = 0;
 	@OriginalMember(owner = "client!sd", name = "X", descriptor = "Z")
@@ -579,11 +579,11 @@ public class LoginManager {
 			for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
 				@Pc(115) int local115 = (local80 << 8) + local97;
 				regionBitPacked[local74] = local115;
-				mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_558, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[]{aClass100_558, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97)}));
-				locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1090, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[]{aClass100_1090, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97)}));
-				npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_807, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[]{aClass100_807, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97)}));
-				underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_772, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[]{aClass100_772, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97)}));
-				underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { aClass100_1103, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97) }));
+				underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[]{aClass100_1103, JagString.parseInt(local80), UNDERSCORE, JagString.parseInt(local97)}));
 				if (npcSpawnsFileIds[local74] == -1) {
 					mapFileIds[local74] = -1;
 					locationsMapFileIds[local74] = -1;

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

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

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

@@ -136,7 +136,7 @@ public class MaterialManager {
 		@Pc(11) int[] local11;
 		if (texture3D != -1) {
 			local4 = GlRenderer.gl;
-            local11 = new int[] {texture3D};
+			local11 = new int[]{texture3D};
 			local4.glDeleteTextures(1, local11, 0);
 			texture3D = -1;
 			GlCleaner.onCardTexture -= textureBuffer.limit() * 2;
@@ -149,7 +149,7 @@ public class MaterialManager {
 		}
 		if (waterfallTextureId != -1) {
 			local4 = GlRenderer.gl;
-            local11 = new int[] {waterfallTextureId};
+			local11 = new int[]{waterfallTextureId};
 			local4.glDeleteTextures(1, local11, 0);
 			waterfallTextureId = -1;
 			GlCleaner.onCardTexture -= aByteBuffer6.limit() * 2;

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.util.Random;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.util.Random;
+
 @OriginalClass("client!wf")
 public abstract class MaterialManager_Class106 {
 
@@ -147,7 +148,7 @@ public abstract class MaterialManager_Class106 {
 	private void method3843() {
 		this.aShortArray70 = new short[this.anInt5008];
 		for (@Pc(12) int local12 = 0; local12 < this.anInt5008; local12++) {
-			this.aShortArray70[local12] = (short) Math.pow(2.0D, (double) local12);
+			this.aShortArray70[local12] = (short) Math.pow(2.0D, local12);
 		}
 	}
 
@@ -156,7 +157,7 @@ public abstract class MaterialManager_Class106 {
 
 	@OriginalMember(owner = "client!wf", name = "c", descriptor = "(I)V")
 	private void method3847() {
-		@Pc(12) Random local12 = new Random((long) this.anInt5000);
+		@Pc(12) Random local12 = new Random(this.anInt5000);
 		@Pc(14) int local14;
 		for (local14 = 0; local14 < 255; local14++) {
 			this.aShortArray69[local14] = (short) local14;

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

@@ -39,7 +39,7 @@ public class MaterialManager_Class106_Sub1 extends MaterialManager_Class106 {
 		super(arg0, arg1, arg2, arg3, arg4);
 		this.anInt4134 = (int) (arg7 * 4096.0F);
 		this.anInt4139 = (int) (arg6 * 4096.0F);
-		this.anInt4129 = this.anInt4133 = (int) (Math.pow(0.5D, (double) -arg5) * 4096.0D);
+		this.anInt4129 = this.anInt4133 = (int) (Math.pow(0.5D, -arg5) * 4096.0D);
 	}
 
 	@OriginalMember(owner = "client!we", name = "a", descriptor = "(IB)V")

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

@@ -24,7 +24,7 @@ public class MaterialManager_Class106_Sub2 extends MaterialManager_Class106 {
 	protected MaterialManager_Class106_Sub2(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) float arg5) {
 		super(arg0, arg1, arg2, arg3, arg4);
 		for (@Pc(15) int local15 = 0; local15 < this.anInt5008; local15++) {
-			this.anIntArray441[local15] = (short) (Math.pow((double) arg5, (double) local15) * 4096.0D);
+			this.anIntArray441[local15] = (short) (Math.pow(arg5, local15) * 4096.0D);
 		}
 	}
 

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

@@ -9,7 +9,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class MidiDecoder {
 
 	@OriginalMember(owner = "client!ki", name = "e", descriptor = "[B")
-    public static final byte[] STATUS_LENGTHS = new byte[] { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	public static final byte[] STATUS_LENGTHS = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 	@OriginalMember(owner = "client!ki", name = "b", descriptor = "[I")
 	public int[] times;
 

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

@@ -111,17 +111,17 @@ public final class MidiPcmStream extends PcmStream {
 	public final synchronized boolean isSongReady(@OriginalArg(0) Song arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) SoundBank arg2) {
 		arg0.createPrograms();
 		@Pc(5) boolean local5 = true;
-		@Pc(20) int[] local20 = new int[] { 22050 };
+		@Pc(20) int[] local20 = new int[]{22050};
 		for (@Pc(34) ByteArrayNode local34 = (ByteArrayNode) arg0.programs.head(); local34 != null; local34 = (ByteArrayNode) arg0.programs.next()) {
 			@Pc(40) int local40 = (int) local34.key;
-			@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get((long) local40);
+			@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get(local40);
 			if (local48 == null) {
 				local48 = MidiInstrument.method2320(arg1, local40);
 				if (local48 == null) {
 					local5 = false;
 					continue;
 				}
-				this.aClass133_23.put(local48, (long) local40);
+				this.aClass133_23.put(local48, local40);
 			}
 			if (!local48.method2436(local20, arg2, local34.value)) {
 				local5 = false;
@@ -278,7 +278,7 @@ public final class MidiPcmStream extends PcmStream {
 				}
 			}
 		}
-		@Pc(118) MidiInstrument local118 = (MidiInstrument) this.aClass133_23.get((long) this.anIntArray506[arg1]);
+		@Pc(118) MidiInstrument local118 = (MidiInstrument) this.aClass133_23.get(this.anIntArray506[arg1]);
 		if (local118 == null) {
 			return;
 		}

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

@@ -78,7 +78,7 @@ public final class MillisTimer extends Timer {
 		if (arg0 > this.anInt3552) {
 			this.anInt3552 = arg0;
 		}
-		ThreadUtils.sleep((long) this.anInt3552);
+		ThreadUtils.sleep(this.anInt3552);
 		local139 = 0;
 		while (this.anInt3553 < 256) {
 			this.anInt3553 += this.anInt3550;

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

@@ -6,9 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public class MiniMap {
 	@OriginalMember(owner = "client!ke", name = "T", descriptor = "[[I")
-	public static final int[][] anIntArrayArray24 = new int[][] { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1 }, { 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1 }, { 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 }, { 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1 }, { 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1 } };
+	public static final int[][] anIntArrayArray24 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
 	@OriginalMember(owner = "client!wc", name = "h", descriptor = "[[I")
-    public static final int[][] anIntArrayArray46 = new int[][] { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3 }, { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, { 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 } };
+	public static final int[][] anIntArrayArray46 = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}};
 	@OriginalMember(owner = "client!qc", name = "ab", descriptor = "[I")
 	public static final int[] locId = new int[1000];
 	@OriginalMember(owner = "client!lf", name = "d", descriptor = "[I")
@@ -235,7 +235,7 @@ public class MiniMap {
 			SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.width, arg1 + arg3.height);
 		}
 		if (state != 2 && state != 5 && sprite != null) {
-            @Pc(48) int local48 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
+			@Pc(48) int local48 = anInt1814 + (int) Camera.yawTarget & 0x7FF;
 			@Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
 			@Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
 			if (GlRenderer.enabled) {
@@ -351,10 +351,7 @@ public class MiniMap {
 							break;
 						}
 					}
-                    @Pc(682) boolean local682 = false;
+					@Pc(682) boolean local682 = PlayerList.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == PlayerList.self.anInt1650;
-                    if (PlayerList.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == PlayerList.self.anInt1650) {
-                        local682 = true;
-                    }
 					if (local626) {
 						method1446(arg3, Sprites.mapdots[3], local154, local150, arg1, arg2);
 					} else if (local660) {
@@ -420,7 +417,7 @@ public class MiniMap {
 			return;
 		}
 		@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
-		@Pc(27) int local27 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
+		@Pc(27) int local27 = anInt1814 + (int) Camera.yawTarget & 0x7FF;
 		@Pc(39) int local39 = Math.max(arg0.width / 2, arg0.height / 2) + 10;
 		if (local39 * local39 < local21) {
 			return;
@@ -450,14 +447,14 @@ public class MiniMap {
 			return;
 		}
 		local30 -= 10;
-        @Pc(58) int local58 = anInt1814 + (int)Camera.yawTarget & 0x7FF;
+		@Pc(58) int local58 = anInt1814 + (int) Camera.yawTarget & 0x7FF;
 		@Pc(62) int local62 = MathUtils.cos[local58];
 		@Pc(66) int local66 = MathUtils.sin[local58];
 		@Pc(74) int local74 = local66 * 256 / (anInt4130 + 256);
 		@Pc(82) int local82 = local62 * 256 / (anInt4130 + 256);
 		@Pc(93) int local93 = arg4 * local74 + local82 * arg3 >> 16;
 		@Pc(104) int local104 = arg4 * local82 - local74 * arg3 >> 16;
-        @Pc(110) double local110 = Math.atan2((double) local93, (double) local104);
+		@Pc(110) double local110 = Math.atan2(local93, local104);
 		@Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30);
 		@Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30);
 		if (GlRenderer.enabled) {

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

@@ -139,7 +139,7 @@ public class MiniMenu {
 		if (component.anInt530 == 2 && !aBoolean302) {
 			local47 = MiniMap.getTargetVerb(component);
 			if (local47 != null) {
-                add(-1, 0L, JagString.concatenate(new JagString[] {COLOR_GREEN, component.aClass100_85 }), -1, (short) 32, local47, component.id);
+				add(-1, 0L, JagString.concatenate(new JagString[]{COLOR_GREEN, component.aClass100_85}), -1, (short) 32, local47, component.id);
 			}
 		}
 		if (component.anInt530 == 3) {
@@ -174,12 +174,12 @@ public class MiniMenu {
 							@Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1);
 							if (anInt5014 == 1 && local267.isObjOpsEnabled()) {
 								if (MiniMap.anInt5062 != component.id || anInt4370 != local171) {
-                                    add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id);
+									add(-1, local276.id, JagString.concatenate(new JagString[]{aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id);
 								}
 							} else if (aBoolean302 && local267.isObjOpsEnabled()) {
 								@Pc(596) ParamType local596 = anInt3039 == -1 ? null : ParamTypeList.get(anInt3039);
 								if ((anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, anInt3039) != local596.defaultInt)) {
-                                    add(anInt5393, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
+									add(anInt5393, local276.id, JagString.concatenate(new JagString[]{aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
 								}
 							} else {
 								@Pc(296) JagString[] local296 = local276.iops;
@@ -196,12 +196,12 @@ public class MiniMenu {
 											} else {
 												local334 = 58;
 											}
-                                            add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
+											add(-1, local276.id, JagString.concatenate(new JagString[]{aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
 										}
 									}
 								}
 								if (local267.method507()) {
-                                    add(MiniMap.anInt4075, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
+									add(MiniMap.anInt4075, local276.id, JagString.concatenate(new JagString[]{aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
 								}
 								if (local267.isObjOpsEnabled() && local296 != null) {
 									for (local309 = 2; local309 >= 0; local309--) {
@@ -216,7 +216,7 @@ public class MiniMenu {
 											if (local309 == 2) {
 												local334 = 43;
 											}
-                                            add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
+											add(-1, local276.id, JagString.concatenate(new JagString[]{aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
 										}
 									}
 								}
@@ -243,11 +243,11 @@ public class MiniMenu {
 											if (local309 == 4) {
 												local334 = 13;
 											}
-                                            add(-1, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
+											add(-1, local276.id, JagString.concatenate(new JagString[]{aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
 										}
 									}
 								}
-                                add(MiniMap.anInt5073, (long) local276.id, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
+								add(MiniMap.anInt5073, local276.id, JagString.concatenate(new JagString[]{aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
 							}
 						}
 					}
@@ -262,7 +262,7 @@ public class MiniMenu {
 			for (local171 = 9; local171 >= 5; local171--) {
 				@Pc(765) JagString local765 = InterfaceList.getOp(component, local171);
 				if (local765 != null) {
-                    add(getOpCursor(local171, component), (long) (local171 + 1), component.optionBase, component.createdComponentId, (short) 1003, local765, component.id);
+					add(getOpCursor(local171, component), local171 + 1, component.optionBase, component.createdComponentId, (short) 1003, local765, component.id);
 				}
 			}
 			local47 = MiniMap.getTargetVerb(component);
@@ -272,14 +272,14 @@ public class MiniMenu {
 			for (local173 = 4; local173 >= 0; local173--) {
 				@Pc(828) JagString local828 = InterfaceList.getOp(component, local173);
 				if (local828 != null) {
-                    add(getOpCursor(local173, component), (long) (local173 + 1), component.optionBase, component.createdComponentId, (short) 9, local828, component.id);
+					add(getOpCursor(local173, component), local173 + 1, component.optionBase, component.createdComponentId, (short) 9, local828, component.id);
 				}
 			}
 			if (InterfaceList.getServerActiveProperties(component).method506()) {
 				add(-1, 0L, JagString.EMPTY, component.createdComponentId, (short) 41, LocalizedText.CONTINUE, component.id);
 			}
 		} else if (InterfaceList.getServerActiveProperties(component).method508() && (anInt4999 & 0x20) != 0) {
-            add(anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.optionBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
+			add(anInt5393, 0L, JagString.concatenate(new JagString[]{aClass100_466, aClass100_408, component.optionBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
 		}
 	}
 
@@ -349,7 +349,7 @@ public class MiniMenu {
 
 	@OriginalMember(owner = "client!wa", name = "a", descriptor = "(IZ)Lclient!na;")
 	public static JagString getOp(@OriginalArg(0) int i) {
-        return opBases[i].length() > 0 ? JagString.concatenate(new JagString[] { ops[i], LocalizedText.MINISEPARATOR, opBases[i] }) : ops[i];
+		return opBases[i].length() > 0 ? JagString.concatenate(new JagString[]{ops[i], LocalizedText.MINISEPARATOR, opBases[i]}) : ops[i];
 	}
 
 	@OriginalMember(owner = "client!i", name = "p", descriptor = "(II)V")
@@ -508,7 +508,7 @@ public class MiniMenu {
 				Protocol.outboundBuffer.p1isaac(92);
 				Protocol.outboundBuffer.ip2add(local36);
 			} else {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name}));
+				Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[]{JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name}));
 			}
 			anInt2043 = 0;
 			pressedInventoryComponent = InterfaceList.getComponent(local19);
@@ -523,7 +523,7 @@ public class MiniMenu {
 				} else if (PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) {
 					Protocol.outboundBuffer.p1(Static1.anInt5);
 					Protocol.outboundBuffer.p1(anInt2878);
-                    Protocol.outboundBuffer.p2((int)Camera.yawTarget);
+					Protocol.outboundBuffer.p2((int) Camera.yawTarget);
 					Protocol.outboundBuffer.p1(57);
 					Protocol.outboundBuffer.p1(MiniMap.anInt1814);
 					Protocol.outboundBuffer.p1(MiniMap.anInt4130);
@@ -680,9 +680,9 @@ public class MiniMenu {
 					aClass100_545 = aClass100_1042;
 				}
 				if (local693.if3) {
-                    aClass100_466 = JagString.concatenate(new JagString[] { local693.optionBase, COLOR_WHITE});
+					aClass100_466 = JagString.concatenate(new JagString[]{local693.optionBase, COLOR_WHITE});
 				} else {
-                    aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, COLOR_WHITE});
+					aClass100_466 = JagString.concatenate(new JagString[]{COLOR_GREEN, local693.aClass100_85, COLOR_WHITE});
 				}
 			}
 			return;
@@ -926,7 +926,7 @@ public class MiniMenu {
 			anInt5014 = 1;
 			anInt4997 = local36;
 			InterfaceList.redraw(local693);
-            aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE});
+			aClass100_203 = JagString.concatenate(new JagString[]{aClass100_32, ObjTypeList.get(local36).name, COLOR_WHITE});
 			if (aClass100_203 == null) {
 				aClass100_203 = NULL;
 			}
@@ -1124,11 +1124,11 @@ public class MiniMenu {
 						continue;
 					}
 					if (anInt5014 == 1) {
-                        add(MiniMap.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
+						add(MiniMap.anInt4075, local121, JagString.concatenate(new JagString[]{aClass100_203, aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
 					} else if (aBoolean302) {
 						@Pc(363) ParamType local363 = anInt3039 == -1 ? null : ParamTypeList.get(anInt3039);
 						if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, anInt3039) != local363.defaultInt)) {
-                            add(anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
+							add(anInt5393, local121, JagString.concatenate(new JagString[]{aClass100_466, aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
 						}
 					} else {
 						@Pc(228) JagString[] local228 = local172.ops;
@@ -1161,11 +1161,11 @@ public class MiniMenu {
 									if (local240 == 4) {
 										local254 = 1001;
 									}
-                                    add(local268, local121, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, local254, local228[local240], z);
+									add(local268, local121, JagString.concatenate(new JagString[]{aClass100_1008, local172.name}), x, local254, local228[local240], z);
 								}
 							}
 						}
-                        add(MiniMap.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z);
+						add(MiniMap.anInt5073, local172.id, JagString.concatenate(new JagString[]{aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z);
 					}
 				}
 				@Pc(514) int local514;
@@ -1229,11 +1229,11 @@ public class MiniMenu {
 							local240 = node.value.type;
 							@Pc(951) ObjType local951 = ObjTypeList.get(local240);
 							if (anInt5014 == 1) {
-                                add(MiniMap.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z);
+								add(MiniMap.anInt4075, local240, JagString.concatenate(new JagString[]{aClass100_203, aClass100_947, local951.name}), x, (short) 33, LocalizedText.USE, z);
 							} else if (aBoolean302) {
 								@Pc(1142) ParamType local1142 = anInt3039 == -1 ? null : ParamTypeList.get(anInt3039);
 								if ((anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, anInt3039) != local1142.defaultInt)) {
-                                    add(anInt5393, (long) local240, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local951.name }), x, (short) 39, aClass100_545, z);
+									add(anInt5393, local240, JagString.concatenate(new JagString[]{aClass100_466, aClass100_947, local951.name}), x, (short) 39, aClass100_545, z);
 								}
 							} else {
 								@Pc(997) JagString[] local997 = local951.ops;
@@ -1265,10 +1265,10 @@ public class MiniMenu {
 										if (local514 == 4) {
 											local1025 = 24;
 										}
-                                        add(local1041, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, local1025, local997[local514], z);
+										add(local1041, local240, JagString.concatenate(new JagString[]{aClass100_32, local951.name}), x, local1025, local997[local514], z);
 									}
 								}
-                                add(MiniMap.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z);
+								add(MiniMap.anInt5073, local240, JagString.concatenate(new JagString[]{aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z);
 							}
 						}
 					}
@@ -1281,16 +1281,16 @@ public class MiniMenu {
 	public static JagString method471() {
 		@Pc(32) JagString local32;
 		if (anInt5014 == 1 && size < 2) {
-            local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, aClass100_203, aClass100_961});
+			local32 = JagString.concatenate(new JagString[]{LocalizedText.USE, LocalizedText.MINISEPARATOR, aClass100_203, aClass100_961});
 		} else if (aBoolean302 && size < 2) {
-            local32 = JagString.concatenate(new JagString[] { aClass100_545, LocalizedText.MINISEPARATOR, aClass100_466, aClass100_961});
+			local32 = JagString.concatenate(new JagString[]{aClass100_545, LocalizedText.MINISEPARATOR, aClass100_466, aClass100_961});
 		} else if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && size > 2) {
 			local32 = getOp(size - 2);
 		} else {
 			local32 = getOp(size - 1);
 		}
 		if (size > 2) {
-            local32 = JagString.concatenate(new JagString[] { local32, aClass100_2, JagString.parseInt(size - 2), LocalizedText.MOREOPTIONS});
+			local32 = JagString.concatenate(new JagString[]{local32, aClass100_2, JagString.parseInt(size - 2), LocalizedText.MOREOPTIONS});
 		}
 		return local32;
 	}
@@ -1299,9 +1299,9 @@ public class MiniMenu {
 	public static JagString[] annotateOps(@OriginalArg(1) JagString[] ops) {
 		@Pc(8) JagString[] annotatedOps = new JagString[5];
 		for (@Pc(15) int i = 0; i < 5; i++) {
-            annotatedOps[i] = JagString.concatenate(new JagString[] { JagString.parseInt(i), aClass100_168 });
+			annotatedOps[i] = JagString.concatenate(new JagString[]{JagString.parseInt(i), aClass100_168});
 			if (ops != null && ops[i] != null) {
-                annotatedOps[i] = JagString.concatenate(new JagString[] { annotatedOps[i], ops[i] });
+				annotatedOps[i] = JagString.concatenate(new JagString[]{annotatedOps[i], ops[i]});
 			}
 		}
 		return annotatedOps;
@@ -1321,14 +1321,14 @@ public class MiniMenu {
 		@Pc(35) JagString local35 = arg0.name;
 		if (arg0.combatLevel != 0) {
 			@Pc(47) JagString local47 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
-            local35 = JagString.concatenate(new JagString[] { local35, getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), OPEN_PARENTHESIS, local47, JagString.parseInt(arg0.combatLevel), CLOSE_PARENTHESIS});
+			local35 = JagString.concatenate(new JagString[]{local35, getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), OPEN_PARENTHESIS, local47, JagString.parseInt(arg0.combatLevel), CLOSE_PARENTHESIS});
 		}
 		if (anInt5014 == 1) {
-            add(MiniMap.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
+			add(MiniMap.anInt4075, arg2, JagString.concatenate(new JagString[]{aClass100_203, aClass100_407, local35}), arg1, (short) 26, LocalizedText.USE, arg3);
 		} else if (aBoolean302) {
 			@Pc(378) ParamType local378 = anInt3039 == -1 ? null : ParamTypeList.get(anInt3039);
 			if ((anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(anInt3039, local378.defaultInt) != local378.defaultInt)) {
-                add(anInt5393, (long) arg2, JagString.concatenate(new JagString[] {aClass100_466, aClass100_407, local35 }), arg1, (short) 45, aClass100_545, arg3);
+				add(anInt5393, arg2, JagString.concatenate(new JagString[]{aClass100_466, aClass100_407, local35}), arg1, (short) 45, aClass100_545, arg3);
 			}
 		} else {
 			@Pc(129) JagString[] local129 = arg0.ops;
@@ -1362,7 +1362,7 @@ public class MiniMenu {
 						if (local140 == 4) {
 							local161 = 2;
 						}
-                        add(local176, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, local161, local129[local140], arg3);
+						add(local176, arg2, JagString.concatenate(new JagString[]{aClass100_965, local35}), arg1, local161, local129[local140], arg3);
 					}
 				}
 			}
@@ -1392,11 +1392,11 @@ public class MiniMenu {
 						if (local281 != 0) {
 							local281 += local271;
 						}
-                        add(arg0.anInt3752, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, local281, local129[local140], arg3);
+						add(arg0.anInt3752, arg2, JagString.concatenate(new JagString[]{aClass100_965, local35}), arg1, local281, local129[local140], arg3);
 					}
 				}
 			}
-            add(MiniMap.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
+			add(MiniMap.anInt5073, arg2, JagString.concatenate(new JagString[]{aClass100_965, local35}), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
 		}
 	}
 
@@ -1422,16 +1422,16 @@ public class MiniMenu {
 			}
 			@Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
 			if (other.combatLevelWithSummoning > other.combatLevel) {
-                string = JagString.concatenate(new JagString[] { other.getName(), markCombatDifference ? getCombatLevelColor(other.combatLevel, PlayerList.self.combatLevel) : COLOR_WHITE, OPEN_PARENTHESIS, local95, JagString.parseInt(other.combatLevel), PLUS, JagString.parseInt(other.combatLevelWithSummoning - other.combatLevel), CLOSE_PARENTHESIS});
+				string = JagString.concatenate(new JagString[]{other.getName(), markCombatDifference ? getCombatLevelColor(other.combatLevel, PlayerList.self.combatLevel) : COLOR_WHITE, OPEN_PARENTHESIS, local95, JagString.parseInt(other.combatLevel), PLUS, JagString.parseInt(other.combatLevelWithSummoning - other.combatLevel), CLOSE_PARENTHESIS});
 			} else {
-                string = JagString.concatenate(new JagString[] { other.getName(), markCombatDifference ? getCombatLevelColor(other.combatLevel, PlayerList.self.combatLevel) : COLOR_WHITE, OPEN_PARENTHESIS, local95, JagString.parseInt(other.combatLevel), CLOSE_PARENTHESIS});
+				string = JagString.concatenate(new JagString[]{other.getName(), markCombatDifference ? getCombatLevelColor(other.combatLevel, PlayerList.self.combatLevel) : COLOR_WHITE, OPEN_PARENTHESIS, local95, JagString.parseInt(other.combatLevel), CLOSE_PARENTHESIS});
 			}
 		} else {
-            string = JagString.concatenate(new JagString[] { other.getName(), OPEN_PARENTHESIS, LocalizedText.SKILL, JagString.parseInt(other.skill), CLOSE_PARENTHESIS});
+			string = JagString.concatenate(new JagString[]{other.getName(), OPEN_PARENTHESIS, LocalizedText.SKILL, JagString.parseInt(other.skill), CLOSE_PARENTHESIS});
 		}
 		@Pc(275) int local275;
 		if (anInt5014 == 1) {
-            add(MiniMap.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1);
+			add(MiniMap.anInt4075, arg0, JagString.concatenate(new JagString[]{aClass100_203, aClass100_561, string}), arg3, (short) 1, LocalizedText.USE, arg1);
 		} else if (!aBoolean302) {
 			for (local275 = 7; local275 >= 0; local275--) {
 				if (Player.options[local275] != null) {
@@ -1452,15 +1452,15 @@ public class MiniMenu {
 					}
 					@Pc(353) short local353 = Static5.aShortArray2[local275];
 					@Pc(358) short local358 = (short) (local353 + local291);
-                    add(Player.cursors[local275], (long) arg0, JagString.concatenate(new JagString[] {COLOR_WHITE, string }), arg3, local358, Player.options[local275], arg1);
+					add(Player.cursors[local275], arg0, JagString.concatenate(new JagString[]{COLOR_WHITE, string}), arg3, local358, Player.options[local275], arg1);
 				}
 			}
 		} else if ((anInt4999 & 0x8) != 0) {
-            add(anInt5393, (long) arg0, JagString.concatenate(new JagString[] {aClass100_466, aClass100_561, string }), arg3, (short) 15, aClass100_545, arg1);
+			add(anInt5393, arg0, JagString.concatenate(new JagString[]{aClass100_466, aClass100_561, string}), arg3, (short) 15, aClass100_545, arg1);
 		}
 		for (local275 = 0; local275 < size; local275++) {
 			if (actions[local275] == 60) {
-                opBases[local275] = JagString.concatenate(new JagString[] {COLOR_WHITE, string });
+				opBases[local275] = JagString.concatenate(new JagString[]{COLOR_WHITE, string});
 				break;
 			}
 		}

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

@@ -69,14 +69,8 @@ public abstract class Model extends Entity {
 		local5 = 0;
 		@Pc(136) int local136 = 0;
 		for (@Pc(138) int local138 = 0; local138 < arg0.transforms; local138++) {
-			@Pc(144) boolean local144 = false;
+			@Pc(144) boolean local144 = local5 < arg1.length && arg1.indices[local5] == local138;
-			if (local5 < arg1.length && arg1.indices[local5] == local138) {
+			@Pc(158) boolean local158 = local136 < arg2.length && arg2.indices[local136] == local138;
-				local144 = true;
-			}
-			@Pc(158) boolean local158 = false;
-			if (local136 < arg2.length && arg2.indices[local136] == local138) {
-				local158 = true;
-			}
 			if (local144 || local158) {
 				if (arg5 == null || arg5[local138] == arg6 || arg0.types[local138] == 0) {
 					@Pc(196) short local196 = 0;
@@ -340,13 +334,13 @@ public abstract class Model extends Entity {
 		@Pc(98) int local98 = local42 < local77 ? local42 : local77;
 		@Pc(105) int local105 = local24 < local60 ? local24 : local60;
 		if (arg5 != 0) {
-			@Pc(120) int local120 = (int) (Math.atan2((double) (local84 - local91), (double) arg5) * 325.95D) & 0x7FF;
+			@Pc(120) int local120 = (int) (Math.atan2(local84 - local91, arg5) * 325.95D) & 0x7FF;
 			if (local120 != 0) {
 				this.rotateX(local120);
 			}
 		}
 		if (arg4 != 0) {
-			@Pc(140) int local140 = (int) (Math.atan2((double) (local105 - local98), (double) arg4) * 325.95D) & 0x7FF;
+			@Pc(140) int local140 = (int) (Math.atan2(local105 - local98, arg4) * 325.95D) & 0x7FF;
 			if (local140 != 0) {
 				this.rotateZ(local140);
 			}

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

@@ -45,7 +45,7 @@ public final class MonochromeImageCache {
 		@Pc(8) int local8 = 0;
 		for (@Pc(10) int local10 = 0; local10 < 256; local10++) {
 			for (@Pc(15) int local15 = 0; local15 <= local10; local15++) {
-				aByteArray53[local8++] = (byte) (255.0D / Math.sqrt((double) ((float) (local15 * local15 + local10 * local10 + 65535) / 65535.0F)));
+				aByteArray53[local8++] = (byte) (255.0D / Math.sqrt((float) (local15 * local15 + local10 * local10 + 65535) / 65535.0F));
 			}
 		}
 

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

@@ -1,17 +1,13 @@
 package rt4;
 
-import java.awt.Component;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 import javax.swing.*;
+import java.awt.Component;
+import java.awt.event.*;
 
 @OriginalClass("client!ug")
 public final class Mouse implements MouseListener, MouseMotionListener, FocusListener {

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

@@ -1,11 +1,12 @@
 package rt4;
 
-import java.awt.Component;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
+import java.awt.Component;
+
 @OriginalClass("client!uc")
 public abstract class MouseWheel {
 

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

@@ -30,7 +30,7 @@ public final class MsiType {
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IB)Lclient!ek;")
 	public final SoftwareIndexedSprite getSprite(@OriginalArg(0) int arg0) {
-		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) MsiTypeList.sprites.get((long) (arg0 << 16 | this.spriteId));
+		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) MsiTypeList.sprites.get(arg0 << 16 | this.spriteId);
 		if (local17 != null) {
 			return local17;
 		}
@@ -43,7 +43,7 @@ public final class MsiType {
 			for (@Pc(59) int local59 = 0; local59 < arg0; local59++) {
 				local17.flipVertical();
 			}
-			MsiTypeList.sprites.put(local17, (long) (arg0 << 16 | this.spriteId));
+			MsiTypeList.sprites.put(local17, arg0 << 16 | this.spriteId);
 		}
 		return local17;
 	}

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

@@ -22,7 +22,7 @@ public class MsiTypeList {
 
 	@OriginalMember(owner = "client!da", name = "c", descriptor = "(II)Lclient!aa;")
 	public static MsiType get(@OriginalArg(0) int arg0) {
-        @Pc(10) MsiType local10 = (MsiType) types.get((long) arg0);
+		@Pc(10) MsiType local10 = (MsiType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -31,7 +31,7 @@ public class MsiTypeList {
 		if (local20 != null) {
 			local10.decode(new Buffer(local20), arg0);
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -146,7 +146,6 @@ public final class Npc extends PathingEntity {
 	@Override
 	public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (this.type == null) {
-			;
 		}
 	}
 

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

@@ -310,7 +310,7 @@ public class NpcList {
 				local36 = arg0.zFine - local26.zFine;
 				local43 = arg0.xFine - local26.xFine;
 				if (local43 != 0 || local36 != 0) {
-					arg0.anInt3400 = (int) (Math.atan2((double) local43, (double) local36) * 325.949D) & 0x7FF;
+					arg0.anInt3400 = (int) (Math.atan2(local43, local36) * 325.949D) & 0x7FF;
 				}
 			}
 		}
@@ -326,7 +326,7 @@ public class NpcList {
 				local94 = arg0.zFine - local83.zFine;
 				local36 = arg0.xFine - local83.xFine;
 				if (local36 != 0 || local94 != 0) {
-					arg0.anInt3400 = (int) (Math.atan2((double) local36, (double) local94) * 325.949D) & 0x7FF;
+					arg0.anInt3400 = (int) (Math.atan2(local36, local94) * 325.949D) & 0x7FF;
 				}
 			}
 		}
@@ -334,7 +334,7 @@ public class NpcList {
 			local70 = arg0.xFine - (arg0.faceX - Camera.originX - Camera.originX) * 64;
 			local43 = arg0.zFine - (arg0.faceY - Camera.originZ - Camera.originZ) * 64;
 			if (local70 != 0 || local43 != 0) {
-				arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF;
+				arg0.anInt3400 = (int) (Math.atan2(local70, local43) * 325.949D) & 0x7FF;
 			}
 			arg0.faceY = 0;
 			arg0.faceX = 0;

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

@@ -227,7 +227,7 @@ public final class NpcType {
 		if (this.params == null) {
 			return arg1;
 		} else {
-			@Pc(18) IntNode local18 = (IntNode) this.params.get((long) arg0);
+			@Pc(18) IntNode local18 = (IntNode) this.params.get(arg0);
 			return local18 == null ? arg1 : local18.value;
 		}
 	}
@@ -238,7 +238,7 @@ public final class NpcType {
 			@Pc(13) NpcType local13 = this.getMultiNpc();
 			return local13 == null ? null : local13.getBodyModel(seqs, arg1, arg2, arg3, arg4, arg5, seqType1, arg7, seqType2);
 		}
-		@Pc(40) Model local40 = (Model) NpcTypeList.models.get((long) this.id);
+		@Pc(40) Model local40 = (Model) NpcTypeList.models.get(this.id);
 		@Pc(46) boolean local46;
 		@Pc(173) int local173;
 		@Pc(235) int local235;
@@ -352,7 +352,7 @@ public final class NpcType {
 			if (GlRenderer.enabled) {
 				((GlModel) local40).method4111(false, false, false, false, false, true);
 			}
-			NpcTypeList.models.put(local40, (long) this.id);
+			NpcTypeList.models.put(local40, this.id);
 		}
 		local46 = false;
 		@Pc(721) boolean local721 = false;
@@ -497,7 +497,7 @@ public final class NpcType {
 		if (this.params == null) {
 			return arg1;
 		} else {
-			@Pc(18) StringNode local18 = (StringNode) this.params.get((long) arg0);
+			@Pc(18) StringNode local18 = (StringNode) this.params.get(arg0);
 			return local18 == null ? arg1 : local18.value;
 		}
 	}
@@ -525,7 +525,7 @@ public final class NpcType {
 		} else if (this.anIntArray354 == null) {
 			return null;
 		} else {
-			@Pc(41) Model local41 = (Model) NpcTypeList.headModels.get((long) this.id);
+			@Pc(41) Model local41 = (Model) NpcTypeList.headModels.get(this.id);
 			if (local41 == null) {
 				@Pc(46) boolean local46 = false;
 				for (@Pc(48) int local48 = 0; local48 < this.anIntArray354.length; local48++) {
@@ -562,7 +562,7 @@ public final class NpcType {
 					}
 				}
 				local41 = local119.createModel(64, 768, -50, -10, -50);
-				NpcTypeList.headModels.put(local41, (long) this.id);
+				NpcTypeList.headModels.put(local41, this.id);
 			}
 			if (arg0 != null) {
 				local41 = arg0.method4215(local41, arg2, arg1, arg3);
@@ -746,7 +746,7 @@ public final class NpcType {
 					} else {
 						local605 = new IntNode(arg1.g4());
 					}
-					this.params.put(local605, (long) local596);
+					this.params.put(local605, local596);
 				}
 			}
 		}

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

@@ -24,7 +24,7 @@ public class NpcTypeList {
 
 	@OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;")
 	public static NpcType get(@OriginalArg(0) int arg0) {
-        @Pc(10) NpcType local10 = (NpcType) types.get((long) arg0);
+		@Pc(10) NpcType local10 = (NpcType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -35,7 +35,7 @@ public class NpcTypeList {
 			local10.decode(new Buffer(local26));
 		}
 		local10.method2942();
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 

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

@@ -152,7 +152,7 @@ public final class ObjType {
 	public int manwear = -1;
 
 	@OriginalMember(owner = "client!h", name = "qb", descriptor = "[Lclient!na;")
-	public JagString[] ops = new JagString[] { null, null, LocalizedText.TAKE, null, null };
+	public JagString[] ops = new JagString[]{null, null, LocalizedText.TAKE, null, null};
 
 	@OriginalMember(owner = "client!h", name = "ub", descriptor = "I")
 	private int resizeX = 128;
@@ -164,7 +164,7 @@ public final class ObjType {
 	private int manWearYOff = 0;
 
 	@OriginalMember(owner = "client!h", name = "U", descriptor = "[Lclient!na;")
-	public JagString[] iops = new JagString[] { null, null, null, null, LocalizedText.DROP};
+	public JagString[] iops = new JagString[]{null, null, null, null, LocalizedText.DROP};
 
 	@OriginalMember(owner = "client!h", name = "Ab", descriptor = "I")
 	public int zoom2d = 2000;
@@ -183,10 +183,7 @@ public final class ObjType {
 		if (manhead1 == -1) {
 			return true;
 		}
-		@Pc(33) boolean ready = true;
+		@Pc(33) boolean ready = ObjTypeList.modelsArchive.isFileReady(0, manhead1);
-		if (!ObjTypeList.modelsArchive.isFileReady(0, manhead1)) {
-			ready = false;
-		}
 		if (manhead2 != -1 && !ObjTypeList.modelsArchive.isFileReady(0, manhead2)) {
 			ready = false;
 		}
@@ -232,10 +229,7 @@ public final class ObjType {
 		if (wear1 == -1) {
 			return true;
 		}
-		@Pc(41) boolean ready = true;
+		@Pc(41) boolean ready = ObjTypeList.modelsArchive.isFileReady(0, wear1);
-		if (!ObjTypeList.modelsArchive.isFileReady(0, wear1)) {
-			ready = false;
-		}
 		if (wear2 != -1 && !ObjTypeList.modelsArchive.isFileReady(0, wear2)) {
 			ready = false;
 		}
@@ -577,7 +571,7 @@ public final class ObjType {
 		@Pc(36) RawModel model = RawModel.create(ObjTypeList.modelsArchive, head);
 		if (head2 != -1) {
 			@Pc(44) RawModel model2 = RawModel.create(ObjTypeList.modelsArchive, head2);
-			@Pc(55) RawModel[] models = new RawModel[] { model, model2 };
+			@Pc(55) RawModel[] models = new RawModel[]{model, model2};
 			model = new RawModel(models, 2);
 		}
 		@Pc(66) int i;
@@ -611,11 +605,11 @@ public final class ObjType {
 		if (wear2 != -1) {
 			@Pc(54) RawModel model2 = RawModel.create(ObjTypeList.modelsArchive, wear2);
 			if (wear3 == -1) {
-				@Pc(68) RawModel[] models = new RawModel[] { model, model2 };
+				@Pc(68) RawModel[] models = new RawModel[]{model, model2};
 				model = new RawModel(models, 2);
 			} else {
 				@Pc(81) RawModel model3 = RawModel.create(ObjTypeList.modelsArchive, wear3);
-				@Pc(96) RawModel[] models = new RawModel[] { model, model2, model3 };
+				@Pc(96) RawModel[] models = new RawModel[]{model, model2, model3};
 				model = new RawModel(models, 3);
 			}
 		}

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

@@ -33,14 +33,14 @@ public class ObjTypeList {
 		archive = arg0;
 		@Pc(23) int local23 = archive.capacity() - 1;
 		anInt3245 = archive.getGroupCapacity(local23) + local23 * 256;
-        aClass100Array104 = new JagString[] { null, null, null, null, LocalizedText.DROP};
+		aClass100Array104 = new JagString[]{null, null, null, null, LocalizedText.DROP};
-        aClass100Array87 = new JagString[] { null, null, LocalizedText.TAKE, null, null };
+		aClass100Array87 = new JagString[]{null, null, LocalizedText.TAKE, null, null};
 		font = arg1;
 	}
 
 	@OriginalMember(owner = "client!fk", name = "a", descriptor = "(IB)Lclient!h;")
 	public static ObjType get(@OriginalArg(0) int arg0) {
-        @Pc(6) ObjType local6 = (ObjType) types.get((long) arg0);
+		@Pc(6) ObjType local6 = (ObjType) types.get(arg0);
 		if (local6 != null) {
 			return local6;
 		}
@@ -64,7 +64,7 @@ public class ObjTypeList {
 			local6.stockMarket = false;
 			local6.ops = aClass100Array87;
 		}
-        types.put(local6, (long) arg0);
+		types.put(local6, arg0);
 		return local6;
 	}
 

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

@@ -9,7 +9,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Packet extends Buffer {
 
 	@OriginalMember(owner = "client!bh", name = "G", descriptor = "[I")
-	public static final int[] BIT_MASKS = new int[] { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1 };
+	public static final int[] BIT_MASKS = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1};
 
 	@OriginalMember(owner = "client!i", name = "Xb", descriptor = "Lclient!ij;")
 	private IsaacRandom isaac;

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

@@ -17,7 +17,7 @@ public class ParamTypeList {
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(II)Lclient!hn;")
 	public static ParamType get(@OriginalArg(1) int arg0) {
-        @Pc(6) ParamType local6 = (ParamType) types.get((long) arg0);
+		@Pc(6) ParamType local6 = (ParamType) types.get(arg0);
 		if (local6 != null) {
 			return local6;
 		}
@@ -26,7 +26,7 @@ public class ParamTypeList {
 		if (local30 != null) {
 			local6.decode(new Buffer(local30));
 		}
-        types.put(local6, (long) arg0);
+		types.put(local6, arg0);
 		return local6;
 	}
 }

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

@@ -19,7 +19,7 @@ public final class ParticleSystem extends ParticleNode {
 	public static void load() {
 		@Pc(1) GL2 gl = GlRenderer.gl;
 		if (gl.isExtensionAvailable("GL_ARB_point_parameters")) {
-            @Pc(20) float[] coefficients = new float[] { 1.0F, 0.0F, 5.0E-4F };
+			@Pc(20) float[] coefficients = new float[]{1.0F, 0.0F, 5.0E-4F};
 			gl.glPointParameterfv(GL2.GL_POINT_DISTANCE_ATTENUATION, coefficients, 0);
 			@Pc(28) FloatBuffer buffer = FloatBuffer.allocate(1);
 			gl.glGetFloatv(GL2.GL_POINT_SIZE_MAX, buffer);

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

@@ -198,11 +198,7 @@ public class PathFinder {
 		if (local61 > 0) {
 			ClientProt.method3502(local61, arg9);
 			return true;
-        } else if (arg9 == 1) {
+		} else return arg9 != 1;
-            return false;
-        } else {
-            return true;
-        }
 	}
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IIIIIIIIZIII)Z")
@@ -374,11 +370,7 @@ public class PathFinder {
 		if (local64 > 0) {
 			ClientProt.method3502(local64, arg4);
 			return true;
-        } else if (arg4 == 1) {
+		} else return arg4 != 1;
-            return false;
-        } else {
-            return true;
-        }
 	}
 
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IBIIIIIIIIIZI)Z")
@@ -404,7 +396,8 @@ public class PathFinder {
 		@Pc(76) int[][] local76 = collisionMaps[Player.level].flags;
 		@Pc(201) int local201;
 		@Pc(242) int local242;
-        label397: while (local69 != local65) {
+		label397:
+		while (local69 != local65) {
 			local3 = queueX[local69];
 			local10 = queueZ[local69];
 			local69 = local69 + 1 & 0xFFF;
@@ -625,11 +618,7 @@ public class PathFinder {
 		if (local69 > 0) {
 			ClientProt.method3502(local69, arg2);
 			return true;
-        } else if (arg2 == 1) {
+		} else return arg2 != 1;
-            return false;
-        } else {
-            return true;
-        }
 	}
 
 	@OriginalMember(owner = "client!t", name = "a", descriptor = "(BJII)Z")