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/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/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/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/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;

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 {
 
@@ -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];
@@ -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")

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 {
@@ -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;
@@ -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) {
@@ -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")

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();

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 {
 

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/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/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

@@ -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

@@ -33,7 +33,7 @@ public final class Inv extends Node {
 		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];
@@ -273,7 +273,7 @@ public final class Inv extends Node {
 
 	@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 {
 

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")

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/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

@@ -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;
@@ -377,7 +382,8 @@ public class LightingManager {
 		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) {

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/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/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_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/MidiPcmStream.java

@@ -114,14 +114,14 @@ public final class MidiPcmStream extends PcmStream {
 		@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

@@ -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) {
@@ -457,7 +454,7 @@ public class MiniMap {
 		@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

@@ -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,7 +272,7 @@ 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()) {
@@ -1165,7 +1165,7 @@ public class MiniMenu {
 								}
 							}
 						}
-                        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);
 							}
 						}
 					}
@@ -1324,11 +1324,11 @@ public class MiniMenu {
 			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);
 		}
 	}
 
@@ -1431,7 +1431,7 @@ public class MiniMenu {
 		}
 		@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,11 +1452,11 @@ 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) {

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

@@ -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;
 		}

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

@@ -40,7 +40,7 @@ public class ObjTypeList {
 
 	@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/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/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")

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

@@ -395,11 +395,11 @@ public abstract class PathingEntity extends Entity {
 		@Pc(231) int local231 = local224 > local201 ? local201 : local224;
 		@Pc(238) int local238 = local224 > local134 ? local134 : local224;
 		@Pc(245) int local245 = local201 <= local87 ? local201 : local87;
-		anInt2640 = (int) (Math.atan2((double) (local212 - local231), (double) local27) * 325.95D) & 0x7FF;
+		anInt2640 = (int) (Math.atan2(local212 - local231, local27) * 325.95D) & 0x7FF;
 		if (anInt2640 != 0) {
 			arg0.rotateX(anInt2640);
 		}
-		anInt2680 = (int) (Math.atan2((double) (local245 - local238), (double) local24) * 325.95D) & 0x7FF;
+		anInt2680 = (int) (Math.atan2(local245 - local238, local24) * 325.95D) & 0x7FF;
 		if (anInt2680 != 0) {
 			arg0.rotateZ(anInt2680);
 		}

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

@@ -555,7 +555,7 @@ public final class Player extends PathingEntity {
 		if (local12 < 16 || local12 > 360000) {
 			return;
 		}
-		@Pc(34) int local34 = (int) (Math.atan2((double) arg3, (double) arg1) * 325.949D) & 0x7FF;
+		@Pc(34) int local34 = (int) (Math.atan2(arg3, arg1) * 325.949D) & 0x7FF;
 		@Pc(46) Model local46 = HintArrowManager.getModel(local34, this.zFine, arg11, this.xFine, arg2, this.anInt3424);
 		if (local46 == null) {
 			return;

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

@@ -174,7 +174,7 @@ public final class ProjAnim extends Entity {
 	public final void method3705(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		@Pc(17) double local17;
 		if (!this.aBoolean239) {
-			@Pc(10) double local10 = (double) (arg0 - this.anInt4817);
+			@Pc(10) double local10 = arg0 - this.anInt4817;
 			local17 = arg3 - this.anInt4804;
 			@Pc(26) double local26 = Math.sqrt(local17 * local17 + local10 * local10);
 			this.aDouble6 = this.anInt4813;

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

@@ -1948,7 +1948,8 @@ public class Protocol {
 			@Pc(4425) boolean ignored = false;
 			@Pc(4431) long messageId = bot + ((long) top << 32);
 			int ix = 0;
-            check: while (true) {
+			check:
+			while (true) {
 				if (ix >= 100) {
 					if (rights <= 1) {
 						if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) {
@@ -1994,7 +1995,8 @@ public class Protocol {
 			int rights = inboundBuffer.g1();
 			@Pc(4632) boolean ignored = false;
 			@Pc(4634) int ix = 0;
-            check: while (true) {
+			check:
+			while (true) {
 				if (ix >= 100) {
 					if (rights <= 1) {
 						if (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat) {
@@ -3486,7 +3488,7 @@ public class Protocol {
 				}
 			}
 		}
-        @Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736);
+		@Pc(152) long local152 = (arg0 << 7) + arg1 + 1610612736;
 		SceneGraph.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.value, local152, local89, local91);
 	}
 }

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

@@ -20,7 +20,7 @@ public class QuickChatCatTypeList {
 
 	@OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;")
 	public static QuickChatCatType get(@OriginalArg(0) int arg0) {
-        @Pc(10) QuickChatCatType local10 = (QuickChatCatType) types.get((long) arg0);
+		@Pc(10) QuickChatCatType local10 = (QuickChatCatType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -37,7 +37,7 @@ public class QuickChatCatTypeList {
 		if (arg0 >= 32768) {
 			local10.method465();
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 }

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

@@ -49,7 +49,7 @@ public final class QuickChatPhraseType extends SecondaryNode {
 		for (@Pc(14) int local14 = 0; this.anIntArray71.length > local14 && local14 < arg1.length; local14++) {
 			@Pc(38) int local38 = DYNAMIC_COMMAND_ENCODE_BYTES[this.getDynamicCommand(local14)];
 			if (local38 > 0) {
-				arg0.pVarLong(local38, (long) arg1[local14]);
+				arg0.pVarLong(local38, arg1[local14]);
 			}
 		}
 	}

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

@@ -33,7 +33,7 @@ public class QuickChatPhraseTypeList {
 
 	@OriginalMember(owner = "client!sj", name = "b", descriptor = "(II)Lclient!cb;")
 	public static QuickChatPhraseType get(@OriginalArg(1) int arg0) {
-        @Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) types.get((long) arg0);
+		@Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) types.get(arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -50,7 +50,7 @@ public class QuickChatPhraseTypeList {
 		if (arg0 >= 32768) {
 			local10.method763();
 		}
-        types.put(local10, (long) arg0);
+		types.put(local10, arg0);
 		return local10;
 	}
 }

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

@@ -607,13 +607,13 @@ public final class RawModel 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.method1677(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.rotate(local140);
 			}
@@ -665,7 +665,7 @@ public final class RawModel extends Entity {
 				local120 >>= 0x1;
 			}
 
-			@Pc(174) int local174 = (int) Math.sqrt((double) (local112 * local112 + local120 * local120 + local128 * local128));
+			@Pc(174) int local174 = (int) Math.sqrt(local112 * local112 + local120 * local120 + local128 * local128);
 			if (local174 <= 0) {
 				local174 = 1;
 			}

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

@@ -2358,7 +2358,7 @@ public class SceneGraph {
 			local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2);
 		}
 		local213 = null;
-		@Pc(261) long local261 = (long) (arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20);
+		@Pc(261) long local261 = arg7 | 0x40000000 | arg8 << 7 | arg6 << 14 | arg9 << 20;
 		if (arg3) {
 			local213 = surfaceTileHeights[0];
 		} else if (arg0 < 3) {
@@ -2888,11 +2888,7 @@ public class SceneGraph {
 						if (aBooleanArrayArray1[local32 + visibility - Static123.anInt4069][local37 + visibility - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
 							local46.aBoolean45 = true;
 							local46.aBoolean46 = true;
-                            if (local46.sceneryLen > 0) {
+							local46.aBoolean47 = local46.sceneryLen > 0;
-                                local46.aBoolean47 = true;
-                            } else {
-                                local46.aBoolean47 = false;
-                            }
 							Static156.anInt1142++;
 						} else {
 							local46.aBoolean45 = false;

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

@@ -1,11 +1,12 @@
 package rt4;
 
+import org.openrs2.deob.annotation.OriginalArg;
+import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.Date;
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class ScriptRunner {
 
@@ -458,11 +459,11 @@ public final class ScriptRunner {
 					@Pc(512) Sprite local512 = Sprites.hitbars[1];
 					if (local17 instanceof Npc) {
 						@Pc(518) Npc local518 = (Npc) local17;
-						@Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId);
+						@Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get(local518.type.hitBarId);
 						if (local528 == null) {
 							local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8);
 							if (local528 != null) {
-								HitBarList.hitBars.put(local528, (long) local518.type.hitBarId);
+								HitBarList.hitBars.put(local528, local518.type.hitBarId);
 							}
 						}
 						if (local528 != null && local528.length == 2) {
@@ -713,7 +714,8 @@ public final class ScriptRunner {
 				}
 			}
 		}
-		label220: for (local28 = 0; local28 < local3; local28++) {
+		label220:
+		for (local28 = 0; local28 < local3; local28++) {
 			@Pc(272) long local272;
 			if (arg0) {
 				local39 = PlayerList.self;
@@ -723,10 +725,7 @@ public final class ScriptRunner {
 				local272 = (long) PlayerList.ids[local28] << 32;
 			}
 			if (local39 != null && local39.method2682()) {
-				local39.aBoolean98 = false;
+				local39.aBoolean98 = (Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId;
-				if ((Preferences.manyIdleAnimations && PlayerList.size > 200 || PlayerList.size > 50) && !arg0 && local39.movementSeqId == local39.getBasType().idleAnimationId) {
-					local39.aBoolean98 = true;
-				}
 				local82 = local39.getSize();
 				if (local82 == 1) {
 					if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
@@ -841,7 +840,8 @@ public final class ScriptRunner {
 				}
 			}
 		}
-		label200: for (local7 = 0; local7 < NpcList.size; local7++) {
+		label200:
+		for (local7 = 0; local7 < NpcList.size; local7++) {
 			local16 = NpcList.npcs[NpcList.ids[local7]];
 			@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
 			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
@@ -1060,7 +1060,8 @@ public final class ScriptRunner {
 				}
 				@Pc(150) int local150;
 				@Pc(191) int local191;
-				label238: for (local150 = Player.level + 1; local150 <= 3; local150++) {
+				label238:
+				for (local150 = Player.level + 1; local150 <= 3; local150++) {
 					if ((SceneGraph.tileFlags[local150][local108][local122] & 0x8) == 0) {
 						@Pc(227) int local227;
 						@Pc(358) int local358;
@@ -1675,7 +1676,8 @@ public final class ScriptRunner {
 				}
 			}
 			cycles = 0;
-			nextOp: while (true) {
+			nextOp:
+			while (true) {
 				cycles++;
 				if (maxCycles < cycles) {
 					throw new RuntimeException("slow");
@@ -1913,7 +1915,7 @@ public final class ScriptRunner {
 					if (opcode == 51) {
 						@Pc(992) HashTable local992 = script.switchTables[intOperands[pc]];
 						isp--;
-						@Pc(1002) IntNode local1002 = (IntNode) local992.get((long) intStack[isp]);
+						@Pc(1002) IntNode local1002 = (IntNode) local992.get(intStack[isp]);
 						if (local1002 != null) {
 							pc += local1002.value;
 						}
@@ -1921,11 +1923,7 @@ public final class ScriptRunner {
 					}
 				}
 				@Pc(1020) boolean local1020;
-				if (intOperands[pc] == 1) {
+				local1020 = intOperands[pc] == 1;
-					local1020 = true;
-				} else {
-					local1020 = false;
-				}
 				@Pc(1182) Component component;
 				@Pc(1052) int int2;
 				@Pc(1063) Component local1063;
@@ -2310,11 +2308,7 @@ public final class ScriptRunner {
 										} else if (component.baseWidth > 0) {
 											component.modelZoom = component.modelZoom * 32 / component.baseWidth;
 										}
-										if (opcode == Cs2Opcodes.setItemNoNum) {
+										component.objDrawText = opcode != Cs2Opcodes.setItemNoNum;
-											component.objDrawText = false;
-										} else {
-											component.objDrawText = true;
-										}
 									}
 									continue;
 								}
@@ -2759,7 +2753,7 @@ public final class ScriptRunner {
 									if (opcode == Cs2Opcodes.hasChild) {
 										isp--;
 										int1 = intStack[isp];
-										@Pc(12566) ComponentPointer local12566 = (ComponentPointer) InterfaceList.openInterfaces.get((long) int1);
+										@Pc(12566) ComponentPointer local12566 = (ComponentPointer) InterfaceList.openInterfaces.get(int1);
 										if (local12566 == null) {
 											intStack[isp++] = 0;
 										} else {
@@ -2788,7 +2782,7 @@ public final class ScriptRunner {
 										isp -= 2;
 										int1 = intStack[isp];
 										int3 = intStack[isp + 1];
-										@Pc(12663) ComponentPointer local12663 = (ComponentPointer) InterfaceList.openInterfaces.get((long) int1);
+										@Pc(12663) ComponentPointer local12663 = (ComponentPointer) InterfaceList.openInterfaces.get(int1);
 										if (local12663 != null && local12663.anInt5878 == int3) {
 											intStack[isp++] = 1;
 											continue;
@@ -3631,7 +3625,7 @@ public final class ScriptRunner {
 										isp -= 3;
 										local4892 = intStack[isp];
 										local4899 = intStack[isp + 1];
-										@Pc(5251) long local5251 = (long) intStack[isp + 2];
+										@Pc(5251) long local5251 = intStack[isp + 2];
 										intStack[isp++] = (int) (local4892 * local5251 / local4899);
 										continue;
 									}
@@ -5615,7 +5609,7 @@ public final class ScriptRunner {
 										local12388 = intStack[isp] != 0;
 										isp--;
 										int3 = intStack[isp];
-										stringStack[ssp++] = StringUtils.formatNumber(client.language, local12388, 0, (long) int3);
+										stringStack[ssp++] = StringUtils.formatNumber(client.language, local12388, 0, int3);
 										continue;
 									}
 								}

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

@@ -18,7 +18,7 @@ public class SeqTypeList {
 
 	@OriginalMember(owner = "client!client", name = "a", descriptor = "(IB)Lclient!tk;")
 	public static SeqType get(@OriginalArg(0) int id) {
-        @Pc(17) SeqType local17 = (SeqType) types.get((long) id);
+		@Pc(17) SeqType local17 = (SeqType) types.get(id);
 		if (local17 != null) {
 			return local17;
 		}
@@ -29,7 +29,7 @@ public class SeqTypeList {
 			local17.decode(new Buffer(local32));
 		}
 		local17.postDecode();
-        types.put(local17, (long) id);
+		types.put(local17, id);
 		return local17;
 	}
 
@@ -70,13 +70,13 @@ public class SeqTypeList {
 
 	@OriginalMember(owner = "client!fl", name = "b", descriptor = "(II)Lclient!cl;")
 	public static AnimFrameset getAnimFrameset(@OriginalArg(0) int id) {
-        @Pc(19) AnimFrameset frameset = (AnimFrameset) animFramesets.get((long) id);
+		@Pc(19) AnimFrameset frameset = (AnimFrameset) animFramesets.get(id);
 		if (frameset != null) {
 			return frameset;
 		}
 		frameset = AnimFrameset.create(animsArchive, basesArchive, id);
 		if (frameset != null) {
-            animFramesets.put(frameset, (long) id);
+			animFramesets.put(frameset, id);
 		}
 		return frameset;
 	}

client/src/main/java/rt4/Shadow.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!wm")
 public final class Shadow {
 

client/src/main/java/rt4/ShadowManager.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;
@@ -128,7 +128,8 @@ public final class ShadowManager {
 		MaterialManager.setMaterial(0, 0);
 		local1.glDepthMask(false);
 		for (@Pc(17) int local17 = 0; local17 < anInt5346; local17++) {
-			label52: for (@Pc(22) int local22 = 0; local22 < anInt5345; local22++) {
+			label52:
+			for (@Pc(22) int local22 = 0; local22 < anInt5345; local22++) {
 				for (@Pc(29) int local29 = local17 * 8; local29 < local17 * 8 + 8; local29++) {
 					if (local29 - arg0 >= -arg2 && local29 - arg0 <= arg2) {
 						for (@Pc(51) int local51 = local22 * 8; local51 < local22 * 8 + 8; local51++) {

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

@@ -260,10 +260,8 @@ public final class ShapedTile {
 			local146 = arg7;
 		}
 		if (arg8 < local144) {
-			;
 		}
 		if (arg8 > local146) {
-			;
 		}
 	}
 }

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

@@ -1,10 +1,11 @@
 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 java.awt.Component;
+
 @OriginalClass("client!hl")
 public final class SignLinkAudioChannel extends AudioChannel {