rs-client: Cleanup (#1087)

* rs-client: name SpriteBuffer

* rs-client: (re)name spritebuffer methods

* rs-client/deob: Add missed @Export's, make updatemappings fix this next time

* rs-client: run intellij redundant else inspection

* rs-client: invert some script interpreter if's

* deob: checkstyle fixes

* rs-client: SpriteBuffer_loadSprite -> SpriteBuffer_bufferFile

deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java

@@ -0,0 +1,135 @@
+package net.runelite.deob.updater;
+
+import com.google.common.base.Strings;
+import net.runelite.asm.ClassFile;
+import net.runelite.asm.ClassGroup;
+import net.runelite.asm.Field;
+import net.runelite.asm.Method;
+import net.runelite.asm.attributes.Annotations;
+import net.runelite.asm.attributes.annotation.Annotation;
+import net.runelite.asm.attributes.annotation.Element;
+import net.runelite.deob.Deob;
+import net.runelite.deob.DeobAnnotations;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AnnotationAdder
+{
+	AnnotationAdder(ClassGroup group)
+	{
+		this.group = group;
+	}
+
+	private final ClassGroup group;
+	private final Logger log = LoggerFactory.getLogger(AnnotationAdder.class);
+
+	public void run()
+	{
+		int impl = 0;
+		int meth = 0;
+		int field = 0;
+
+		for (ClassFile c : group.getClasses())
+		{
+			if (c.getName().contains("runelite"))
+			{
+				continue;
+			}
+
+			log.debug("Checking {}", c.toString());
+
+			String implementingName = DeobAnnotations.getImplements(c);
+			if (!Strings.isNullOrEmpty(implementingName))
+			{
+				// Still error here cause I don't wanna call classes dumb shit
+				assert implementingName.equals(c.getClassName()) : c + " implements " + implementingName + " but is called " + c.getClassName();
+			}
+			else
+			{
+				if (!Deob.isObfuscated(c.getClassName()))
+				{
+					Annotations an = c.getAnnotations();
+
+					Annotation implAn = new Annotation(an);
+					implAn.setType(DeobAnnotations.IMPLEMENTS);
+
+					Element value = new Element(implAn);
+					value.setValue(c.getClassName());
+					value.setName("value");
+
+					implAn.addElement(value);
+					an.addAnnotation(implAn);
+					impl++;
+				}
+			}
+
+			for (Field f : c.getFields())
+			{
+				Annotations an = f.getAnnotations();
+
+				String fieldName = f.getName();
+				String exportedName = DeobAnnotations.getExportedName(an);
+
+				if (exportedName == null && Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null)
+				{
+					continue;
+				}
+
+				if (!fieldName.equals(exportedName))
+				{
+					log.info("Changed export from {} to {}", exportedName, fieldName);
+					Annotation a = an.find(DeobAnnotations.EXPORT);
+					if (a == null)
+					{
+						a = new Annotation(an);
+						a.setType(DeobAnnotations.EXPORT);
+
+						Element value = new Element(a);
+						value.setValue(fieldName);
+						value.setName("value");
+						a.addElement(value);
+						an.addAnnotation(a);
+
+					}
+					a.getElement().setValue(fieldName);
+					field++;
+				}
+			}
+
+			for (Method m : c.getMethods())
+			{
+				Annotations an = m.getAnnotations();
+
+				String methodName = m.getName();
+				String exportedName = DeobAnnotations.getExportedName(an);
+
+				if (exportedName == null && Deob.isObfuscated(methodName) || methodName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null)
+				{
+					continue;
+				}
+
+				if (!methodName.equals(exportedName))
+				{
+					log.info("Changed export from {} to {}", exportedName, methodName);
+					Annotation a = an.find(DeobAnnotations.EXPORT);
+					if (a == null)
+					{
+						a = new Annotation(an);
+						a.setType(DeobAnnotations.EXPORT);
+
+						Element value = new Element(a);
+						value.setValue(methodName);
+						value.setName("value");
+						a.addElement(value);
+						an.addAnnotation(a);
+
+					}
+					a.getElement().setValue(methodName);
+					meth++;
+				}
+			}
+		}
+
+		log.info("Changed {} classes, {} methods, {} fields", impl, meth, field);
+	}
+}

deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java

@@ -74,6 +74,9 @@ public class UpdateMappings
 		ParameterRenamer pr = new ParameterRenamer(group1, group2, mapping);
 		pr.run();
 
+		AnnotationAdder ad = new AnnotationAdder(group2);
+		ad.run();
+
 		new ScriptOpcodesTransformer().transform(group2);
 	}
 

deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java

@@ -7,8 +7,6 @@ import net.runelite.asm.ClassGroup;
 import net.runelite.asm.Field;
 import net.runelite.asm.Method;
 import net.runelite.asm.attributes.Annotations;
-import net.runelite.asm.attributes.annotation.Annotation;
-import net.runelite.asm.attributes.annotation.Element;
 import net.runelite.deob.Deob;
 import net.runelite.deob.DeobAnnotations;
 import net.runelite.deob.DeobTestProperties;
@@ -92,129 +90,11 @@ public class AnnotationCleaner
 	public void fixMappings() throws Exception
 	{
 		File client = new File(properties.getRsClient());
+
 		ClassGroup group = JarUtil.loadJar(client);
-		int impl = 0,
-			meth = 0,
-			field = 0;
 
-		for (ClassFile c : group.getClasses())
+		new AnnotationAdder(group).run();
-		{
-			if (c.getName().contains("runelite"))
-			{
-				continue;
-			}
 
-			log.debug("Checking {}", c.toString());
-
-			String implementingName = DeobAnnotations.getImplements(c);
-			if (!Strings.isNullOrEmpty(implementingName))
-			{
-				// Still error here cause I don't wanna call classes dumb shit
-				assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName());
-			}
-			else
-			{
-				if (!Deob.isObfuscated(c.getClassName()))
-				{
-					Annotations an = c.getAnnotations();
-
-					Annotation implAn = new Annotation(an);
-					implAn.setType(DeobAnnotations.IMPLEMENTS);
-
-					Element value = new Element(implAn);
-					value.setValue(c.getClassName());
-					value.setName("value");
-
-					implAn.addElement(value);
-					an.addAnnotation(implAn);
-					impl++;
-				}
-			}
-
-			for (Field f : c.getFields())
-			{
-				Annotations an = f.getAnnotations();
-
-				String fieldName = f.getName();
-				String exportedName = DeobAnnotations.getExportedName(an);
-
-				if (exportedName == null && Deob.isObfuscated(fieldName) ||  fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null)
-				{
-					//Annotation exp = new Annotation(an);
-					//exp.setType(DeobAnnotations.EXPORT);
-//
-					//Element ele = new Element(exp);
-					//ele.setValue(fieldName);
-//
-					//log.info("Added export on {}", fieldName);
-					//field++;
-					continue;
-				}
-
-				if (!fieldName.equals(exportedName))
-				{
-					log.info("Changed export from {} to {}", exportedName, fieldName);
-					Annotation a = an.find(DeobAnnotations.EXPORT);
-					if (a == null)
-					{
-						a = new Annotation(an);
-						a.setType(DeobAnnotations.EXPORT);
-
-						Element value = new Element(a);
-						value.setValue(fieldName);
-						value.setName("value");
-						a.addElement(value);
-						an.addAnnotation(a);
-
-					}
-					a.getElement().setValue(fieldName);
-					field++;
-				}
-			}
-
-			for (Method m : c.getMethods())
-			{
-				Annotations an = m.getAnnotations();
-
-				String fieldName = m.getName();
-				String exportedName = DeobAnnotations.getExportedName(an);
-
-				if (exportedName == null && Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null)
-				{
-					continue;
-				//	Annotation exp = new Annotation(an);
-				//	exp.setType(DeobAnnotations.EXPORT);
-//
-				//	Element ele = new Element(exp);
-				//	ele.setValue(fieldName);
-//
-				//	log.info("Added export on {}", fieldName);
-				//	meth++;
-				}
-
-				if (!fieldName.equals(exportedName))
-				{
-					log.info("Changed export from {} to {}", exportedName, fieldName);
-					Annotation a = an.find(DeobAnnotations.EXPORT);
-					if (a == null)
-					{
-						a = new Annotation(an);
-						a.setType(DeobAnnotations.EXPORT);
-
-						Element value = new Element(a);
-						value.setValue(fieldName);
-						value.setName("value");
-						a.addElement(value);
-						an.addAnnotation(a);
-
-					}
-					a.getElement().setValue(fieldName);
-					meth++;
-				}
-			}
-		}
-
-		log.info("Changed {} classes, {} methods, {} fields", impl, meth, field);
 		JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/niec.jar"));
 	}
 }

runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java

@@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient
 		return widgetSpriteOverrides;
 	}
 
-	@Copy("loadSprite")
+	@Copy("SpriteBuffer_getSprite")
 	public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2)
 	{
 		throw new RuntimeException();
 	}
 
-	@Replace("loadSprite")
+	@Replace("SpriteBuffer_getSprite")
 	public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2)
 	{
 		Sprite sprite = spriteOverrides.get(var1);

runescape-client/src/main/java/AbstractArchive.java

@@ -266,9 +266,8 @@ public abstract class AbstractArchive {
 			}
 
 			return var5;
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@ObfuscatedName("k")
@@ -281,16 +280,15 @@ public abstract class AbstractArchive {
 		if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) {
 			if (this.files[var1][var2] != null) {
 				return true;
-			} else if (this.groups[var1] != null) {
+			}
+			if (this.groups[var1] != null) {
 				return true;
-			} else {
+			}
 			this.loadGroup(var1);
 			return this.groups[var1] != null;
 		}
-		} else {
 		return false;
 	}
-	}
 
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
@@ -300,11 +298,11 @@ public abstract class AbstractArchive {
 	public boolean method4147(int var1) {
 		if (this.files.length == 1) {
 			return this.tryLoadFile(0, var1);
-		} else if (this.files[var1].length == 1) {
-			return this.tryLoadFile(var1, 0);
-		} else {
-			throw new RuntimeException();
 		}
+		if (this.files[var1].length == 1) {
+			return this.tryLoadFile(var1, 0);
+		}
+		throw new RuntimeException();
 	}
 
 	@ObfuscatedName("b")
@@ -316,11 +314,10 @@ public abstract class AbstractArchive {
 	public boolean tryLoadGroup(int var1) {
 		if (this.groups[var1] != null) {
 			return true;
-		} else {
+		}
 		this.loadGroup(var1);
 		return this.groups[var1] != null;
 	}
-	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
@@ -363,11 +360,11 @@ public abstract class AbstractArchive {
 	public byte[] takeFileFlat(int var1) {
 		if (this.files.length == 1) {
 			return this.takeFile(0, var1);
-		} else if (this.files[var1].length == 1) {
-			return this.takeFile(var1, 0);
-		} else {
-			throw new RuntimeException();
 		}
+		if (this.files[var1].length == 1) {
+			return this.takeFile(var1, 0);
+		}
+		throw new RuntimeException();
 	}
 
 	@ObfuscatedName("x")
@@ -391,9 +388,8 @@ public abstract class AbstractArchive {
 
 			byte[] var4 = ArchiveDisk.byteArrayFromObject(this.files[var1][var2], false);
 			return var4;
-		} else {
-			return null;
 		}
+		return null;
 	}
 
 	@ObfuscatedName("r")
@@ -405,11 +401,11 @@ public abstract class AbstractArchive {
 	public byte[] getFileFlat(int var1) {
 		if (this.files.length == 1) {
 			return this.getFile(0, var1);
-		} else if (this.files[var1].length == 1) {
-			return this.getFile(var1, 0);
-		} else {
-			throw new RuntimeException();
 		}
+		if (this.files[var1].length == 1) {
+			return this.getFile(var1, 0);
+		}
+		throw new RuntimeException();
 	}
 
 	@ObfuscatedName("v")
@@ -503,7 +499,7 @@ public abstract class AbstractArchive {
 	boolean buildFiles(int var1, int[] var2) {
 		if (this.groups[var1] == null) {
 			return false;
-		} else {
+		}
 		int var3 = this.fileCounts[var1];
 		int[] var4 = this.fileIds[var1];
 		Object[] var5 = this.files[var1];
@@ -518,7 +514,7 @@ public abstract class AbstractArchive {
 
 		if (var6) {
 			return true;
-			} else {
+		}
 		byte[] var21;
 		if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
 			var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], false);
@@ -616,8 +612,6 @@ public abstract class AbstractArchive {
 
 		return true;
 	}
-		}
-	}
 
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
@@ -653,11 +647,10 @@ public abstract class AbstractArchive {
 		int var3 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1));
 		if (var3 < 0) {
 			return false;
-		} else {
+		}
 		int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2));
 		return var4 >= 0;
 	}
-	}
 
 	@ObfuscatedName("as")
 	@ObfuscatedSignature(
@@ -744,15 +737,16 @@ public abstract class AbstractArchive {
 			HealthBarUpdate.Interpreter_intStackSize -= 3;
 			class81.queueSoundEffect(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]);
 			return 1;
-		} else if (var0 == ScriptOpcodes.SOUND_SONG) {
+		}
+		if (var0 == ScriptOpcodes.SOUND_SONG) {
 			GrandExchangeOfferTotalQuantityComparator.method93(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			return 1;
-		} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
+		}
+		if (var0 == ScriptOpcodes.SOUND_JINGLE) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			WorldMapLabelSize.method188(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
 			return 1;
-		} else {
+		}
 		return 2;
 	}
-	}
 }

runescape-client/src/main/java/AbstractByteArrayCopier.java

@@ -22,6 +22,7 @@ public abstract class AbstractByteArrayCopier {
 		signature = "([BI)V",
 		garbageValue = "594076777"
 	)
+	@Export("set")
 	public abstract void set(byte[] var1);
 
 	@ObfuscatedName("l")

runescape-client/src/main/java/AbstractFont.java

@@ -219,7 +219,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 	public int stringWidth(String var1) {
 		if (var1 == null) {
 			return 0;
-		} else {
+		}
 		int var2 = -1;
 		int var3 = -1;
 		int var4 = 0;
@@ -268,14 +268,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("v")
 	@Export("breakLines")
 	public int breakLines(String var1, int[] var2, String[] var3) {
 		if (var1 == null) {
 			return 0;
-		} else {
+		}
 		int var4 = 0;
 		int var5 = 0;
 		StringBuilder var6 = new StringBuilder(100);
@@ -373,7 +372,6 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		return var12;
 	}
-	}
 
 	@ObfuscatedName("y")
 	@Export("lineWidth")
@@ -439,7 +437,7 @@ public abstract class AbstractFont extends Rasterizer2D {
 	public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
 		if (var1 == null) {
 			return 0;
-		} else {
+		}
 		this.reset(var6, var7);
 		if (var10 == 0) {
 			var10 = this.ascent;
@@ -493,7 +491,6 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 		return var12;
 	}
-	}
 
 	@ObfuscatedName("al")
 	@Export("drawCenteredWave")

runescape-client/src/main/java/AbstractWorldMapData.java

@@ -247,9 +247,8 @@ public abstract class AbstractWorldMapData {
 		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
 		if (var2 == null) {
 			return -1;
-		} else {
-			return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
 		}
+		return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1;
 	}
 
 	@ObfuscatedName("gj")

runescape-client/src/main/java/AbstractWorldMapIcon.java

@@ -81,9 +81,8 @@ public abstract class AbstractWorldMapIcon {
 	boolean fitsScreen(int var1, int var2) {
 		if (this.elementFitsScreen(var1, var2)) {
 			return true;
-		} else {
-			return this.labelFitsScreen(var1, var2);
 		}
+		return this.labelFitsScreen(var1, var2);
 	}
 
 	@ObfuscatedName("d")
@@ -105,7 +104,7 @@ public abstract class AbstractWorldMapIcon {
 	boolean elementFitsScreen(int var1, int var2) {
 		if (!this.hasValidElement()) {
 			return false;
-		} else {
+		}
 		WorldMapElement var3 = class222.getWorldMapElement(this.getElement());
 		int var4 = this.getSubWidth();
 		int var5 = this.getSubHeight();
@@ -146,7 +145,6 @@ public abstract class AbstractWorldMapIcon {
 
 		return true;
 	}
-	}
 
 	@ObfuscatedName("z")
 	@ObfuscatedSignature(
@@ -158,11 +156,11 @@ public abstract class AbstractWorldMapIcon {
 		WorldMapLabel var3 = this.getLabel();
 		if (var3 == null) {
 			return false;
-		} else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
-			return var2 >= this.screenY && var2 <= this.screenY + var3.height;
-		} else {
-			return false;
 		}
+		if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) {
+			return var2 >= this.screenY && var2 <= this.screenY + var3.height;
+		}
+		return false;
 	}
 
 	@ObfuscatedName("r")

runescape-client/src/main/java/AccessFile.java

@@ -67,11 +67,10 @@ public final class AccessFile {
 			this.file.seek(this.maxSize);
 			this.file.write(1);
 			throw new EOFException();
-		} else {
+		}
 		this.file.write(var1, var2, var3);
 		this.offset += (long)var3;
 	}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(

runescape-client/src/main/java/Animation.java

@@ -113,7 +113,7 @@ public class Animation {
 
 		if (var1.length != var4.offset) {
 			throw new RuntimeException();
-		} else {
+		}
 		this.transformCount = var7;
 		this.transformSkeletonLabels = new int[var7];
 		this.transformXs = new int[var7];
@@ -128,5 +128,4 @@ public class Animation {
 		}
 
 	}
-	}
 }

runescape-client/src/main/java/Archive.java

@@ -102,9 +102,8 @@ public class Archive extends AbstractArchive {
 	int groupLoadPercent(int var1) {
 		if (super.groups[var1] != null) {
 			return 100;
-		} else {
-			return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1);
 		}
+		return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1);
 	}
 
 	@ObfuscatedName("v")
@@ -140,9 +139,10 @@ public class Archive extends AbstractArchive {
 	public int percentage() {
 		if (this.field3155) {
 			return 100;
-		} else if (super.groups != null) {
+		}
+		if (super.groups != null) {
 			return 99;
-		} else {
+		}
 		int var1 = Huffman.method3948(255, this.index);
 		if (var1 >= 100) {
 			var1 = 99;
@@ -150,7 +150,6 @@ public class Archive extends AbstractArchive {
 
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("dt")
 	@ObfuscatedSignature(
@@ -396,11 +395,10 @@ public class Archive extends AbstractArchive {
 
 		if (var1 == 0) {
 			return 100;
-		} else {
+		}
 		var3 = var2 * 100 / var1;
 		return var3;
 	}
-	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(

runescape-client/src/main/java/ArchiveDisk.java

@@ -67,7 +67,7 @@ public final class ArchiveDisk {
 				if (this.idxFile.length() < (long)(var1 * 6 + 6)) {
 					var10000 = null;
 					return (byte[])var10000;
-				} else {
+				}
 				this.idxFile.seek((long)(var1 * 6));
 				this.idxFile.read(ArchiveDisk_buffer, 0, 6);
 				int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
@@ -75,10 +75,11 @@ public final class ArchiveDisk {
 				if (var3 < 0 || var3 > this.maxEntrySize) {
 					var10000 = null;
 					return (byte[])var10000;
-					} else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) {
+				}
+				if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) {
 					var10000 = null;
 					return (byte[])var10000;
-					} else {
+				}
 				byte[] var5 = new byte[var3];
 				int var6 = 0;
 
@@ -140,8 +141,6 @@ public final class ArchiveDisk {
 
 				byte[] var20 = var5;
 				return var20;
-					}
-				}
 			} catch (IOException var18) {
 				return null;
 			}
@@ -163,9 +162,8 @@ public final class ArchiveDisk {
 				}
 
 				return var5;
-			} else {
-				throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3);
 			}
+			throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3);
 		}
 	}
 
@@ -343,21 +341,21 @@ public final class ArchiveDisk {
 	public static byte[] byteArrayFromObject(Object var0, boolean var1) {
 		if (var0 == null) {
 			return null;
-		} else if (var0 instanceof byte[]) {
+		}
+		if (var0 instanceof byte[]) {
 			byte[] var6 = (byte[])((byte[])var0);
 			if (var1) {
 				int var4 = var6.length;
 				byte[] var5 = new byte[var4];
 				System.arraycopy(var6, 0, var5, 0, var4);
 				return var5;
-			} else {
+			}
 			return var6;
 		}
-		} else if (var0 instanceof AbstractByteArrayCopier) {
+		if (var0 instanceof AbstractByteArrayCopier) {
 			AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
 			return var2.get();
-		} else {
+		}
 		throw new IllegalArgumentException();
 	}
-	}
 }

runescape-client/src/main/java/ArchiveDiskAction.java

@@ -42,7 +42,7 @@ public class ArchiveDiskAction extends Node {
 		KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
 		var1 = new KitDefinition();
 		if (var2 != null) {
@@ -52,5 +52,4 @@ public class ArchiveDiskAction extends Node {
 		KitDefinition.KitDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/ArchiveDiskActionHandler.java

@@ -99,7 +99,8 @@ public class ArchiveDiskActionHandler implements Runnable {
 	public static final PcmPlayer method4256(TaskHandler var0, int var1, int var2) {
 		if (CollisionMap.PcmPlayer_sampleRate == 0) {
 			throw new IllegalStateException();
-		} else if (var1 >= 0 && var1 < 2) {
+		}
+		if (var1 >= 0 && var1 < 2) {
 			if (var2 < 256) {
 				var2 = 256;
 			}
@@ -133,8 +134,7 @@ public class ArchiveDiskActionHandler implements Runnable {
 			} catch (Throwable var4) {
 				return new PcmPlayer();
 			}
-		} else {
+		}
 		throw new IllegalArgumentException();
 	}
-	}
 }

runescape-client/src/main/java/ArchiveLoader.java

@@ -91,9 +91,10 @@ public class ArchiveLoader {
 		if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
 			if (Interpreter.field1106 >= 10) {
 				throw new RuntimeException();
-			} else if (var3.onResize == null) {
+			}
+			if (var3.onResize == null) {
 				return 0;
-			} else {
+			}
 			ScriptEvent var4 = new ScriptEvent();
 			var4.widget = var3;
 			var4.args = var3.onResize;
@@ -101,10 +102,8 @@ public class ArchiveLoader {
 			Client.scriptEvents.addFirst(var4);
 			return 1;
 		}
-		} else {
 		return 2;
 	}
-	}
 
 	@ObfuscatedName("jk")
 	@ObfuscatedSignature(

runescape-client/src/main/java/AudioFilter.java

@@ -65,7 +65,7 @@ public class AudioFilter {
 
 		if (this.pairs[var1] == 0) {
 			return 0;
-		} else {
+		}
 		var3 = this.method2668(var1, 0, var2);
 		field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2));
 		field1488[var1][1] = var3 * var3;
@@ -103,7 +103,6 @@ public class AudioFilter {
 
 		return this.pairs[var1] * 2;
 	}
-	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(

runescape-client/src/main/java/BoundaryObject.java

@@ -103,14 +103,13 @@ public final class BoundaryObject {
 
 		if (!var4) {
 			return null;
-		} else {
+		}
 		try {
 			return new Frames(var0, var1, var2, var3);
 		} catch (Exception var11) {
 			return null;
 		}
 	}
-	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
@@ -122,7 +121,7 @@ public final class BoundaryObject {
 		EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0);
 		var1 = new EnumDefinition();
 		if (var2 != null) {
@@ -132,5 +131,4 @@ public final class BoundaryObject {
 		EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/Buddy.java

@@ -91,8 +91,7 @@ public class Buddy extends User {
 			}
 
 			return var0 * 10000 / Client.field927;
-		} else {
+		}
 		return 10000;
 	}
-	}
 }

runescape-client/src/main/java/BuddyRankComparator.java

@@ -31,9 +31,8 @@ public class BuddyRankComparator extends AbstractUserComparator {
 	int compareBuddy(Buddy var1, Buddy var2) {
 		if (var2.rank != var1.rank) {
 			return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank;
-		} else {
-			return this.compareUser(var1, var2);
 		}
+		return this.compareUser(var1, var2);
 	}
 
 	public int compare(Object var1, Object var2) {

runescape-client/src/main/java/Buffer.java

@@ -173,11 +173,10 @@ public class Buffer extends Node {
 		int var2 = var1.indexOf(0);
 		if (var2 >= 0) {
 			throw new IllegalArgumentException("");
-		} else {
+		}
 		this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset);
 		this.array[++this.offset - 1] = 0;
 	}
-	}
 
 	@ObfuscatedName("bg")
 	@ObfuscatedSignature(
@@ -189,12 +188,11 @@ public class Buffer extends Node {
 		int var2 = var1.indexOf(0);
 		if (var2 >= 0) {
 			throw new IllegalArgumentException("");
-		} else {
+		}
 		this.array[++this.offset - 1] = 0;
 		this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset);
 		this.array[++this.offset - 1] = 0;
 	}
-	}
 
 	@ObfuscatedName("bh")
 	@ObfuscatedSignature(
@@ -244,13 +242,12 @@ public class Buffer extends Node {
 	public void writeLengthInt(int var1) {
 		if (var1 < 0) {
 			throw new IllegalArgumentException();
-		} else {
+		}
 		this.array[this.offset - var1 - 4] = (byte)(var1 >> 24);
 		this.array[this.offset - var1 - 3] = (byte)(var1 >> 16);
 		this.array[this.offset - var1 - 2] = (byte)(var1 >> 8);
 		this.array[this.offset - var1 - 1] = (byte)var1;
 	}
-	}
 
 	@ObfuscatedName("bc")
 	@ObfuscatedSignature(
@@ -424,9 +421,8 @@ public class Buffer extends Node {
 		if (this.array[this.offset] == 0) {
 			++this.offset;
 			return null;
-		} else {
-			return this.readStringCp1252NullTerminated();
 		}
+		return this.readStringCp1252NullTerminated();
 	}
 
 	@ObfuscatedName("br")
@@ -455,7 +451,7 @@ public class Buffer extends Node {
 		byte var1 = this.array[++this.offset - 1];
 		if (var1 != 0) {
 			throw new IllegalStateException("");
-		} else {
+		}
 		int var2 = this.offset;
 
 		while (this.array[++this.offset - 1] != 0) {
@@ -464,7 +460,6 @@ public class Buffer extends Node {
 		int var3 = this.offset - var2 - 1;
 		return var3 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var2, var3);
 	}
-	}
 
 	@ObfuscatedName("bf")
 	@ObfuscatedSignature(
@@ -476,17 +471,15 @@ public class Buffer extends Node {
 		byte var1 = this.array[++this.offset - 1];
 		if (var1 != 0) {
 			throw new IllegalStateException("");
-		} else {
+		}
 		int var2 = this.readVarInt();
 		if (var2 + this.offset > this.array.length) {
 			throw new IllegalStateException("");
-			} else {
+		}
 		String var3 = ClientPreferences.method1755(this.array, this.offset, var2);
 		this.offset += var2;
 		return var3;
 	}
-		}
-	}
 
 	@ObfuscatedName("bv")
 	@ObfuscatedSignature(
@@ -557,11 +550,10 @@ public class Buffer extends Node {
 	public int method5511() {
 		if (this.array[this.offset] < 0) {
 			return this.readInt() & Integer.MAX_VALUE;
-		} else {
+		}
 		int var1 = this.readUnsignedShort();
 		return var1 == 32767 ? -1 : var1;
 	}
-	}
 
 	@ObfuscatedName("cl")
 	@ObfuscatedSignature(

runescape-client/src/main/java/BufferedFile.java

@@ -100,9 +100,8 @@ public class BufferedFile {
 	public void seek(long var1) throws IOException {
 		if (var1 < 0L) {
 			throw new IOException("");
-		} else {
-			this.offset = var1;
 		}
+		this.offset = var1;
 	}
 
 	@ObfuscatedName("e")
@@ -392,9 +391,10 @@ public class BufferedFile {
 		ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
 		if (var2 == null) {
 			return 0;
-		} else if (var1 == -1) {
+		}
+		if (var1 == -1) {
 			return 0;
-		} else {
+		}
 		int var3 = 0;
 
 		for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
@@ -405,5 +405,4 @@ public class BufferedFile {
 
 		return var3;
 	}
-	}
 }

runescape-client/src/main/java/BufferedSink.java

@@ -74,9 +74,8 @@ public class BufferedSink implements Runnable {
 			}
 
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	@ObfuscatedName("w")
@@ -90,7 +89,7 @@ public class BufferedSink implements Runnable {
 			synchronized(this) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
-				} else {
+				}
 				int var5;
 				if (this.position <= this.limit) {
 					var5 = this.capacity - this.limit + this.position - 1;
@@ -100,7 +99,7 @@ public class BufferedSink implements Runnable {
 
 				if (var5 < var3) {
 					throw new IOException("");
-					} else {
+				}
 				if (var3 + this.limit <= this.capacity) {
 					System.arraycopy(var1, var2, this.buffer, this.limit, var3);
 				} else {
@@ -112,8 +111,6 @@ public class BufferedSink implements Runnable {
 				this.limit = (var3 + this.limit) % this.capacity;
 				this.notifyAll();
 			}
-				}
-			}
 		} else {
 			throw new IOException();
 		}

runescape-client/src/main/java/BufferedSource.java

@@ -61,7 +61,8 @@ public class BufferedSource implements Runnable {
 	boolean isAvailable(int var1) throws IOException {
 		if (var1 == 0) {
 			return true;
-		} else if (var1 > 0 && var1 < this.capacity) {
+		}
+		if (var1 > 0 && var1 < this.capacity) {
 			synchronized(this) {
 				int var3;
 				if (this.position <= this.limit) {
@@ -73,18 +74,15 @@ public class BufferedSource implements Runnable {
 				if (var3 < var1) {
 					if (this.exception != null) {
 						throw new IOException(this.exception.toString());
-					} else {
+					}
 					this.notifyAll();
 					return false;
 				}
-				} else {
 				return true;
 			}
 		}
-		} else {
 		throw new IOException();
 	}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
@@ -103,12 +101,11 @@ public class BufferedSource implements Runnable {
 
 			if (var2 <= 0 && this.exception != null) {
 				throw new IOException(this.exception.toString());
-			} else {
+			}
 			this.notifyAll();
 			return var2;
 		}
 	}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
@@ -121,17 +118,15 @@ public class BufferedSource implements Runnable {
 			if (this.limit == this.position) {
 				if (this.exception != null) {
 					throw new IOException(this.exception.toString());
-				} else {
+				}
 				return -1;
 			}
-			} else {
 			int var2 = this.buffer[this.position] & 255;
 			this.position = (this.position + 1) % this.capacity;
 			this.notifyAll();
 			return var2;
 		}
 	}
-	}
 
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(
@@ -155,7 +150,7 @@ public class BufferedSource implements Runnable {
 
 				if (var3 == 0 && this.exception != null) {
 					throw new IOException(this.exception.toString());
-				} else {
+				}
 				if (var3 + this.position <= this.capacity) {
 					System.arraycopy(this.buffer, this.position, var1, var2, var3);
 				} else {
@@ -169,10 +164,8 @@ public class BufferedSource implements Runnable {
 				return var3;
 			}
 		}
-		} else {
 		throw new IOException();
 	}
-	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
@@ -262,25 +255,25 @@ public class BufferedSource implements Runnable {
 			GrandExchangeOfferWorldComparator.leftTitleSprite = BuddyRankComparator.convertJpgToSprite(var4);
 			NPC.rightTitleSprite = GrandExchangeOfferWorldComparator.leftTitleSprite.mirrorHorizontally();
 			if ((Client.worldProperties & 536870912) != 0) {
-				GroundItem.logoSprite = class215.loadIndexedSpriteByName(var1, "logo_deadman_mode", "");
+				GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", "");
 			} else {
-				GroundItem.logoSprite = class215.loadIndexedSpriteByName(var1, "logo", "");
+				GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", "");
 			}
 
-			Login.titleboxSprite = class215.loadIndexedSpriteByName(var1, "titlebox", "");
+			Login.titleboxSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", "");
-			VarpDefinition.titlebuttonSprite = class215.loadIndexedSpriteByName(var1, "titlebutton", "");
+			VarpDefinition.titlebuttonSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", "");
 			int var6 = var1.getGroupId("runes");
 			int var7 = var1.getFileId(var6, "");
-			IndexedSprite[] var5 = class289.method5281(var1, var6, var7);
+			IndexedSprite[] var5 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var6, var7);
 			Login.runesSprite = var5;
 			var7 = var1.getGroupId("title_mute");
 			int var8 = var1.getFileId(var7, "");
-			IndexedSprite[] var9 = class289.method5281(var1, var7, var8);
+			IndexedSprite[] var9 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var7, var8);
 			Login.title_muteSprite = var9;
-			Login.options_buttons_0Sprite = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,0", "");
+			Login.options_buttons_0Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", "");
-			Message.field606 = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,4", "");
+			Message.field606 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", "");
-			Decimator.options_buttons_2Sprite = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,2", "");
+			Decimator.options_buttons_2Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", "");
-			Login.field1185 = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,6", "");
+			Login.field1185 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", "");
 			class237.field3191 = Login.options_buttons_0Sprite.subWidth;
 			WorldMapDecoration.field212 = Login.options_buttons_0Sprite.subHeight;
 			Ignored.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite);

runescape-client/src/main/java/ChatChannel.java

@@ -234,7 +234,7 @@ public class ChatChannel {
 	static final boolean runCs1(Widget var0) {
 		if (var0.cs1Comparisons == null) {
 			return false;
-		} else {
+		}
 		for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
 			int var2 = Varps.method3969(var0, var1);
 			int var3 = var0.cs1ComparisonValues[var1];
@@ -257,5 +257,4 @@ public class ChatChannel {
 
 		return true;
 	}
-	}
 }

runescape-client/src/main/java/Client.java

@@ -3596,7 +3596,7 @@ public final class Client extends GameShell implements Usernamed {
 		PacketBuffer var3 = var1.packetBuffer;
 		if (var2 == null) {
 			return false;
-		} else {
+		}
 		int var17;
 		String var18;
 		try {
@@ -4958,7 +4958,6 @@ public final class Client extends GameShell implements Usernamed {
 
 		return true;
 	}
-	}
 
 	@ObfuscatedName("hy")
 	@ObfuscatedSignature(
@@ -5313,9 +5312,8 @@ public final class Client extends GameShell implements Usernamed {
 		Widget var2 = class80.getWidget(var0);
 		if (var1 == -1) {
 			return var2;
-		} else {
-			return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
 		}
+		return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
 	}
 
 	@ObfuscatedName("e")

runescape-client/src/main/java/ClientPreferences.java

@@ -229,7 +229,8 @@ public class ClientPreferences {
 		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.publicChatMode;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
+		}
+		if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
 			HealthBarUpdate.Interpreter_intStackSize -= 3;
 			Client.publicChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			class226.field3072 = NetSocket.method3530(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
@@ -244,7 +245,7 @@ public class ClientPreferences {
 			var18.packetBuffer.writeByte(Client.field872);
 			Client.packetWriter.method2219(var18);
 			return 1;
-		} else {
+		}
 		String var3;
 		int var4;
 		if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
@@ -259,7 +260,7 @@ public class ClientPreferences {
 			var6.packetBuffer.writeByte(var5);
 			Client.packetWriter.method2219(var6);
 			return 1;
-			} else {
+		}
 		int var10;
 		if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
@@ -283,7 +284,8 @@ public class ClientPreferences {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
+		}
+		if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
 			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Message var16 = WorldMapIcon_1.method297(var10);
 			if (var16 != null) {
@@ -303,7 +305,8 @@ public class ClientPreferences {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
+		}
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
 			if (class226.field3072 == null) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
 			} else {
@@ -311,7 +314,8 @@ public class ClientPreferences {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
+		}
+		if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
 			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
 			var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			String var14 = var3.toLowerCase();
@@ -438,7 +442,8 @@ public class ClientPreferences {
 			var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
 			Client.packetWriter.method2219(var8);
 			return 1;
-				} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
+		}
+		if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
 			Skills.Interpreter_stringStackSize -= 2;
 			var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize];
 			String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1];
@@ -450,40 +455,8 @@ public class ClientPreferences {
 			var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
 			Client.packetWriter.method2219(var11);
 			return 1;
-				} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
-					if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
-						Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872;
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
-						var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.method1744(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
-						var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.method3686(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
-						var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
-						Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.method3669(var10);
-						return 1;
-					} else if (var0 == ScriptOpcodes.DOCHEAT) {
-						var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-						UserComparator1.doCheat(var3);
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
-						Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim();
-						return 1;
-					} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
-						Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762;
-						return 1;
-					} else if (var0 == 5023) {
-						var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
-						System.out.println(var3);
-						return 1;
-					} else {
-						return 2;
 		}
-				} else {
+		if (var0 == ScriptOpcodes.CHAT_PLAYERNAME) {
 			if (Client.localPlayer != null && Client.localPlayer.username != null) {
 				var3 = Client.localPlayer.username.getName();
 			} else {
@@ -493,7 +466,43 @@ public class ClientPreferences {
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3;
 			return 1;
 		}
+		if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
+			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872;
+			return 1;
 		}
+		if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
+			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.method1744(var10);
+			return 1;
 		}
+		if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
+			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.method3686(var10);
+			return 1;
+		}
+		if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
+			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
+			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.method3669(var10);
+			return 1;
+		}
+		if (var0 == ScriptOpcodes.DOCHEAT) {
+			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
+			UserComparator1.doCheat(var3);
+			return 1;
+		}
+		if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
+			Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim();
+			return 1;
+		}
+		if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
+			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762;
+			return 1;
+		}
+		if (var0 == 5023) {
+			var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
+			System.out.println(var3);
+			return 1;
+		}
+		return 2;
 	}
 }

runescape-client/src/main/java/Coord.java

@@ -77,11 +77,11 @@ public class Coord {
 	boolean equalsCoord(Coord var1) {
 		if (this.plane != var1.plane) {
 			return false;
-		} else if (this.x != var1.x) {
-			return false;
-		} else {
-			return this.y == var1.y;
 		}
+		if (this.x != var1.x) {
+			return false;
+		}
+		return this.y == var1.y;
 	}
 
 	@ObfuscatedName("e")
@@ -101,9 +101,8 @@ public class Coord {
 	public boolean equals(Object var1) {
 		if (this == var1) {
 			return true;
-		} else {
-			return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
 		}
+		return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1);
 	}
 
 	public String toString() {

runescape-client/src/main/java/Decimator.java

@@ -148,7 +148,8 @@ public class Decimator {
 	static final int method2517(int var0, int var1) {
 		if (var0 == -2) {
 			return 12345678;
-		} else if (var0 == -1) {
+		}
+		if (var0 == -1) {
 			if (var1 < 2) {
 				var1 = 2;
 			} else if (var1 > 126) {
@@ -156,7 +157,7 @@ public class Decimator {
 			}
 
 			return var1;
-		} else {
+		}
 		var1 = (var0 & 127) * var1 / 128;
 		if (var1 < 2) {
 			var1 = 2;
@@ -166,7 +167,6 @@ public class Decimator {
 
 		return (var0 & 65408) + var1;
 	}
-	}
 
 	@ObfuscatedName("ge")
 	@ObfuscatedSignature(

runescape-client/src/main/java/DemotingHashTable.java

@@ -48,14 +48,14 @@ public final class DemotingHashTable {
 		Wrapper var3 = (Wrapper)this.hashTable.get(var1);
 		if (var3 == null) {
 			return null;
-		} else {
+		}
 		Object var4 = var3.get();
 		if (var4 == null) {
 			var3.remove();
 			var3.removeDual();
 			this.remaining += var3.size;
 			return null;
-			} else {
+		}
 		if (var3.isSoft()) {
 			DirectWrapper var5 = new DirectWrapper(var4, var3.size);
 			this.hashTable.put(var5, var3.key);
@@ -70,8 +70,6 @@ public final class DemotingHashTable {
 
 		return var4;
 	}
-		}
-	}
 
 	@ObfuscatedName("w")
 	@Export("remove")
@@ -99,7 +97,7 @@ public final class DemotingHashTable {
 	public void put(Object var1, long var2, int var4) {
 		if (var4 > this.capacity) {
 			throw new IllegalStateException();
-		} else {
+		}
 		this.remove(var2);
 		this.remaining -= var4;
 
@@ -123,7 +121,6 @@ public final class DemotingHashTable {
 		this.queue.add(var6);
 		var6.keyDual = 0L;
 	}
-	}
 
 	@ObfuscatedName("k")
 	@Export("demote")

runescape-client/src/main/java/DynamicObject.java

@@ -136,7 +136,7 @@ public class DynamicObject extends Entity {
 
 		if (var12 == null) {
 			return null;
-		} else {
+		}
 		int var2;
 		int var3;
 		if (this.orientation != 1 && this.orientation != 3) {
@@ -157,7 +157,6 @@ public class DynamicObject extends Entity {
 		int var11 = (this.y << 7) + (var3 << 6);
 		return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
 	}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
@@ -261,31 +260,35 @@ public class DynamicObject extends Entity {
 			}
 
 			return var4 - var5;
-		} else if (var2 == 2) {
+		}
+		if (var2 == 2) {
 			return var0.location - var1.location;
-		} else if (var2 == 3) {
+		}
+		if (var2 == 3) {
 			if (var0.activity.equals("-")) {
 				if (var1.activity.equals("-")) {
 					return 0;
-				} else {
+				}
 				return var3 ? -1 : 1;
 			}
-			} else if (var1.activity.equals("-")) {
+			if (var1.activity.equals("-")) {
 				return var3 ? 1 : -1;
-			} else {
+			}
 			return var0.activity.compareTo(var1.activity);
 		}
-		} else if (var2 == 4) {
+		if (var2 == 4) {
 			return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0);
-		} else if (var2 == 5) {
-			return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0);
-		} else if (var2 == 6) {
-			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
-		} else if (var2 == 7) {
-			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
-		} else {
-			return var0.id - var1.id;
 		}
+		if (var2 == 5) {
+			return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0);
+		}
+		if (var2 == 6) {
+			return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
+		}
+		if (var2 == 7) {
+			return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
+		}
+		return var0.id - var1.id;
 	}
 
 	@ObfuscatedName("b")

runescape-client/src/main/java/EnumDefinition.java

@@ -171,33 +171,39 @@ public class EnumDefinition extends DualNode {
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4 + var3;
 			return 1;
-		} else if (var0 == ScriptOpcodes.SUB) {
+		}
+		if (var0 == ScriptOpcodes.SUB) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 - var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.MULTIPLY) {
+		}
+		if (var0 == ScriptOpcodes.MULTIPLY) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 * var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.DIV) {
+		}
+		if (var0 == ScriptOpcodes.DIV) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 / var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOM) {
+		}
+		if (var0 == ScriptOpcodes.RANDOM) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
 			return 1;
-		} else if (var0 == ScriptOpcodes.RANDOMINC) {
+		}
+		if (var0 == ScriptOpcodes.RANDOMINC) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
 			return 1;
-		} else if (var0 == ScriptOpcodes.INTERPOLATE) {
+		}
+		if (var0 == ScriptOpcodes.INTERPOLATE) {
 			HealthBarUpdate.Interpreter_intStackSize -= 5;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -206,37 +212,43 @@ public class EnumDefinition extends DualNode {
 			int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
 			return 1;
-		} else if (var0 == ScriptOpcodes.ADDPERCENT) {
+		}
+		if (var0 == ScriptOpcodes.ADDPERCENT) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100;
 			return 1;
-		} else if (var0 == ScriptOpcodes.SETBIT) {
+		}
+		if (var0 == ScriptOpcodes.SETBIT) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | 1 << var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CLEARBIT) {
+		}
+		if (var0 == ScriptOpcodes.CLEARBIT) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
 			return 1;
-		} else if (var0 == ScriptOpcodes.TESTBIT) {
+		}
+		if (var0 == ScriptOpcodes.TESTBIT) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
 			return 1;
-		} else if (var0 == ScriptOpcodes.MOD) {
+		}
+		if (var0 == ScriptOpcodes.MOD) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 % var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.POW) {
+		}
+		if (var0 == ScriptOpcodes.POW) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -247,14 +259,15 @@ public class EnumDefinition extends DualNode {
 			}
 
 			return 1;
-		} else if (var0 == ScriptOpcodes.INVPOW) {
+		}
+		if (var0 == ScriptOpcodes.INVPOW) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			if (var3 == 0) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
 				return 1;
-			} else {
+			}
 			switch(var4) {
 				case 0:
 					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Integer.MAX_VALUE;
@@ -277,27 +290,28 @@ public class EnumDefinition extends DualNode {
 
 			return 1;
 		}
-		} else if (var0 == ScriptOpcodes.AND) {
+		if (var0 == ScriptOpcodes.AND) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.OR) {
+		}
+		if (var0 == ScriptOpcodes.OR) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | var4;
 			return 1;
-		} else if (var0 == ScriptOpcodes.SCALE) {
+		}
+		if (var0 == ScriptOpcodes.SCALE) {
 			HealthBarUpdate.Interpreter_intStackSize -= 3;
 			long var9 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			long var11 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
 			long var13 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
 			return 1;
-		} else {
+		}
 		return 2;
 	}
-	}
 }

runescape-client/src/main/java/Enumerated.java

@@ -1,3 +1,4 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -10,5 +11,6 @@ public interface Enumerated {
 		signature = "(I)I",
 		garbageValue = "320353268"
 	)
+	@Export("rsOrdinal")
 	int rsOrdinal();
 }

runescape-client/src/main/java/FloorUnderlayDefinition.java

@@ -186,19 +186,8 @@ public class FloorUnderlayDefinition extends DualNode {
 		if (var0 == ScriptOpcodes.IF_GETTARGETMASK) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3));
 			return 1;
-		} else if (var0 != ScriptOpcodes.IF_GETOP) {
-			if (var0 == ScriptOpcodes.IF_GETOPBASE) {
-				if (var3.dataText == null) {
-					Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
-				} else {
-					Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
 		}
-
+		if (var0 == ScriptOpcodes.IF_GETOP) {
-				return 1;
-			} else {
-				return 2;
-			}
-		} else {
 			int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			--var4;
 			if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
@@ -209,5 +198,15 @@ public class FloorUnderlayDefinition extends DualNode {
 
 			return 1;
 		}
+		if (var0 == ScriptOpcodes.IF_GETOPBASE) {
+			if (var3.dataText == null) {
+				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "";
+			} else {
+				Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText;
+			}
+
+			return 1;
+		}
+		return 2;
 	}
 }

runescape-client/src/main/java/FontName.java

@@ -80,7 +80,7 @@ public class FontName {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.getItemDefinition(var3).name;
 			return 1;
-		} else {
+		}
 		int var4;
 		ItemDefinition var5;
 		if (var0 == ScriptOpcodes.OC_OP) {
@@ -95,7 +95,8 @@ public class FontName {
 			}
 
 			return 1;
-			} else if (var0 == ScriptOpcodes.OC_IOP) {
+		}
+		if (var0 == ScriptOpcodes.OC_IOP) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -107,15 +108,17 @@ public class FontName {
 			}
 
 			return 1;
-			} else if (var0 == ScriptOpcodes.OC_COST) {
+		}
+		if (var0 == ScriptOpcodes.OC_COST) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).price;
 			return 1;
-			} else if (var0 == ScriptOpcodes.OC_STACKABLE) {
+		}
+		if (var0 == ScriptOpcodes.OC_STACKABLE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isStackable == 1 ? 1 : 0;
 			return 1;
-			} else {
+		}
 		ItemDefinition var6;
 		if (var0 == ScriptOpcodes.OC_CERT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
@@ -127,7 +130,8 @@ public class FontName {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.OC_UNCERT) {
+		}
+		if (var0 == ScriptOpcodes.OC_UNCERT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var6 = WorldMapArea.getItemDefinition(var3);
 			if (var6.noteTemplate >= 0 && var6.note >= 0) {
@@ -137,11 +141,13 @@ public class FontName {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.OC_MEMBERS) {
+		}
+		if (var0 == ScriptOpcodes.OC_MEMBERS) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isMembersOnly ? 1 : 0;
 			return 1;
-				} else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
+		}
+		if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var6 = WorldMapArea.getItemDefinition(var3);
 			if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
@@ -151,7 +157,8 @@ public class FontName {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
+		}
+		if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var6 = WorldMapArea.getItemDefinition(var3);
 			if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
@@ -161,20 +168,15 @@ public class FontName {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.OC_FIND) {
+		}
+		if (var0 == ScriptOpcodes.OC_FIND) {
 			String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
 			var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			WorldMapDecoration.findItemDefinitions(var7, var4 == 1);
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount;
 			return 1;
-				} else if (var0 != ScriptOpcodes.OC_FINDNEXT) {
-					if (var0 == ScriptOpcodes.OC_FINDRESET) {
-						class32.foundItemIndex = 0;
-						return 1;
-					} else {
-						return 2;
 		}
-				} else {
+		if (var0 == ScriptOpcodes.OC_FINDNEXT) {
 			if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & '\uffff';
 			} else {
@@ -183,8 +185,11 @@ public class FontName {
 
 			return 1;
 		}
+		if (var0 == ScriptOpcodes.OC_FINDRESET) {
+			class32.foundItemIndex = 0;
+			return 1;
 		}
-		}
+		return 2;
 	}
 
 	@ObfuscatedName("ii")
@@ -826,8 +831,7 @@ public class FontName {
 	static String method5318(Widget var0) {
 		if (HealthBar.method1957(class268.getWidgetClickMask(var0)) == 0) {
 			return null;
-		} else {
+		}
 		return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null;
 	}
-	}
 }

runescape-client/src/main/java/Fonts.java

@@ -49,7 +49,7 @@ public class Fonts {
 			if (this.map.containsKey(var5)) {
 				var2.put(var5, this.map.get(var5));
 			} else {
-				Font var6 = class287.method5258(this.spritesArchive, this.fontsArchive, var5.name, "");
+				Font var6 = class287.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, "");
 				if (var6 != null) {
 					this.map.put(var5, var6);
 					var2.put(var5, var6);

runescape-client/src/main/java/Frames.java

@@ -181,7 +181,7 @@ public class Frames extends DualNode {
 		boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
 		if (!var4) {
 			return false;
-		} else {
+		}
 		int var5;
 		int var6;
 		int var7;
@@ -235,17 +235,19 @@ public class Frames extends DualNode {
 		var13 = ViewportMouse.field1746 - var7;
 		if (Math.abs(var11) > var8 + ScriptFrame.field527) {
 			return false;
-			} else if (Math.abs(var12) > var16 + ViewportMouse.field1741) {
+		}
+		if (Math.abs(var12) > var16 + ViewportMouse.field1741) {
 			return false;
-			} else if (Math.abs(var13) > var17 + MenuAction.field1160) {
+		}
+		if (Math.abs(var13) > var17 + MenuAction.field1160) {
 			return false;
-			} else if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) {
+		}
+		if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) {
 			return false;
-			} else if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
+		}
+		if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) {
 			return false;
-			} else {
+		}
 		return Math.abs(var12 * GroundItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741;
 	}
-		}
-	}
 }

runescape-client/src/main/java/Friend.java

@@ -23,23 +23,29 @@ public class Friend extends Buddy {
 	int compareToFriend(Friend var1) {
 		if (super.world == Client.worldId && Client.worldId != var1.world) {
 			return -1;
-		} else if (Client.worldId == var1.world && super.world != Client.worldId) {
-			return 1;
-		} else if (super.world != 0 && var1.world == 0) {
-			return -1;
-		} else if (var1.world != 0 && super.world == 0) {
-			return 1;
-		} else if (this.field3650 && !var1.field3650) {
-			return -1;
-		} else if (!this.field3650 && var1.field3650) {
-			return 1;
-		} else if (this.field3651 && !var1.field3651) {
-			return -1;
-		} else if (!this.field3651 && var1.field3651) {
-			return 1;
-		} else {
-			return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 		}
+		if (Client.worldId == var1.world && super.world != Client.worldId) {
+			return 1;
+		}
+		if (super.world != 0 && var1.world == 0) {
+			return -1;
+		}
+		if (var1.world != 0 && super.world == 0) {
+			return 1;
+		}
+		if (this.field3650 && !var1.field3650) {
+			return -1;
+		}
+		if (!this.field3650 && var1.field3650) {
+			return 1;
+		}
+		if (this.field3651 && !var1.field3651) {
+			return -1;
+		}
+		if (!this.field3651 && var1.field3651) {
+			return 1;
+		}
+		return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
 	}
 
 	@ObfuscatedName("ax")
@@ -61,16 +67,15 @@ public class Friend extends Buddy {
 		signature = "(Lhp;IIB)Z",
 		garbageValue = "-3"
 	)
-	@Export("doesSpriteExist")
+	@Export("SpriteBuffer_bufferFile")
-	public static boolean doesSpriteExist(AbstractArchive var0, int var1, int var2) {
+	public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) {
 		byte[] var3 = var0.takeFile(var1, var2);
 		if (var3 == null) {
 			return false;
-		} else {
+		}
 		class185.SpriteBuffer_decode(var3);
 		return true;
 	}
-	}
 
 	@ObfuscatedName("fv")
 	@ObfuscatedSignature(

runescape-client/src/main/java/FriendSystem.java

@@ -122,11 +122,11 @@ public class FriendSystem {
 	final boolean isFriended(Username var1, boolean var2) {
 		if (var1 == null) {
 			return false;
-		} else if (var1.equals(Client.localPlayer.username)) {
-			return true;
-		} else {
-			return this.friendsList.isFriended(var1, var2);
 		}
+		if (var1.equals(Client.localPlayer.username)) {
+			return true;
+		}
+		return this.friendsList.isFriended(var1, var2);
 	}
 
 	@ObfuscatedName("b")
@@ -138,9 +138,8 @@ public class FriendSystem {
 	final boolean isIgnored(Username var1) {
 		if (var1 == null) {
 			return false;
-		} else {
-			return this.ignoreList.contains(var1);
 		}
+		return this.ignoreList.contains(var1);
 	}
 
 	@ObfuscatedName("i")
@@ -357,49 +356,57 @@ public class FriendSystem {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
 			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
 			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
 			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
 			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
 			return 1;
-		} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
 			return 1;
-		} else {
+		}
 		int var12;
 		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var12 = Client.grandExchangeOffers[var3].status();
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
 			return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var12 = Client.grandExchangeOffers[var3].status();
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
 			return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var12 = Client.grandExchangeOffers[var3].status();
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
 			return 1;
-			} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
+		}
+		if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var12 = Client.grandExchangeOffers[var3].status();
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
 			return 1;
-			} else {
+		}
 		boolean var13;
 		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
 			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
@@ -408,14 +415,16 @@ public class FriendSystem {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
 			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			if (PendingSpawn.grandExchangeEvents != null) {
 				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1;
 			boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
@@ -425,41 +434,47 @@ public class FriendSystem {
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
 			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			if (PendingSpawn.grandExchangeEvents != null) {
 				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
 			var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			if (PendingSpawn.grandExchangeEvents != null) {
 				PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
 			}
 
 			return 1;
-				} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size();
 			return 1;
-				} else {
+		}
 		GrandExchangeEvent var11;
 		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world;
 			return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName();
 			return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
 			return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age;
@@ -469,26 +484,25 @@ public class FriendSystem {
 			String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10;
 			return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
 			return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
 			return 1;
-					} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
+		}
+		if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
 			return 1;
-					} else {
+		}
 		return 2;
 	}
-				}
-			}
-		}
-	}
 }

runescape-client/src/main/java/FriendsList.java

@@ -65,9 +65,8 @@ public class FriendsList extends UserList {
 		Friend var3 = (Friend)this.getByUsername(var1);
 		if (var3 == null) {
 			return false;
-		} else {
-			return !var2 || var3.world != 0;
 		}
+		return !var2 || var3.world != 0;
 	}
 
 	@ObfuscatedName("c")

runescape-client/src/main/java/GameObject.java

@@ -101,8 +101,8 @@ public final class GameObject {
 		signature = "(Lhp;Lhp;III)Lke;",
 		garbageValue = "-1252480817"
 	)
-	@Export("loadFont")
+	@Export("SpriteBuffer_getFont")
-	public static Font loadFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+	public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
-		return !Friend.doesSpriteExist(var0, var2, var3) ? null : WallDecoration.getWorldMapSprite(var1.takeFile(var2, var3));
+		return !Friend.SpriteBuffer_bufferFile(var0, var2, var3) ? null : WallDecoration.SpriteBuffer_createFont(var1.takeFile(var2, var3));
 	}
 }

runescape-client/src/main/java/GameShell.java

@@ -557,25 +557,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
 				if (var1.endsWith("127.0.0.1")) {
 					return true;
-				} else {
+				}
 				while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
 					var1 = var1.substring(0, var1.length() - 1);
 				}
 
 				if (var1.endsWith("192.168.1.")) {
 					return true;
-					} else {
+				}
 				this.error("invalidhost");
 				return false;
 			}
-				}
-			} else {
 			return true;
 		}
-		} else {
 		return true;
 	}
-	}
 
 	@ObfuscatedName("j")
 	@ObfuscatedSignature(
@@ -713,6 +709,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		signature = "(B)V",
 		garbageValue = "-3"
 	)
+	@Export("doCycle")
 	protected abstract void doCycle();
 
 	@ObfuscatedName("ag")
@@ -720,6 +717,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		signature = "(ZB)V",
 		garbageValue = "-5"
 	)
+	@Export("draw")
 	protected abstract void draw(boolean var1);
 
 	@ObfuscatedName("ar")
@@ -992,7 +990,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
 		var1 = new NPCDefinition();
 		var1.id = var0;
@@ -1004,5 +1002,4 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/GrandExchangeEvent.java

@@ -95,7 +95,7 @@ public class GrandExchangeEvent {
 		SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
 		var1 = new SequenceDefinition();
 		if (var2 != null) {
@@ -106,7 +106,6 @@ public class GrandExchangeEvent {
 		SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("jj")
 	@ObfuscatedSignature(

runescape-client/src/main/java/GrandExchangeOffer.java

@@ -207,7 +207,7 @@ public class GrandExchangeOffer {
 			int var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7);
 			WorldMapID.getWorldMap().method6309(var3, var9, var5, true);
 			return 1;
-		} else {
+		}
 		WorldMapArea var11;
 		if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
@@ -219,43 +219,51 @@ public class GrandExchangeOffer {
 
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16;
 			return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			WorldMapID.getWorldMap().setCurrentMapAreaId(var3);
 			return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel();
 			return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			WorldMapID.getWorldMap().setZoomPercentage(var3);
 			return 1;
-			} else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0;
 			return 1;
-			} else {
+		}
 		Coord var15;
 		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y);
 			return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y);
 			return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y);
 			return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y);
 			return 1;
-				} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX();
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY();
 			return 1;
-				} else {
+		}
 		WorldMapArea var13;
 		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
@@ -267,7 +275,8 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var13 = WorldMapID.getWorldMap().getMapArea(var3);
 			if (var13 == null) {
@@ -279,7 +288,8 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var13 = WorldMapID.getWorldMap().getMapArea(var3);
 			if (var13 == null) {
@@ -295,7 +305,8 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var13 = WorldMapID.getWorldMap().getMapArea(var3);
 			if (var13 == null) {
@@ -305,7 +316,8 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-					} else if (var0 == 6615) {
+		}
+		if (var0 == 6615) {
 			var15 = WorldMapID.getWorldMap().getDisplayCoord();
 			if (var15 == null) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
@@ -316,17 +328,19 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId();
 			return 1;
-					} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			var13 = WorldMapID.getWorldMap().getCurrentMapArea();
 			if (var13 == null) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
 				return 1;
-						} else {
+			}
 			int[] var14 = var13.position(var15.plane, var15.x, var15.y);
 			if (var14 == null) {
 					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
@@ -338,7 +352,6 @@ public class GrandExchangeOffer {
 
 			return 1;
 		}
-					} else {
 		Coord var7;
 		if (var0 == 6618) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
@@ -347,7 +360,7 @@ public class GrandExchangeOffer {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
 				return 1;
-							} else {
+			}
 			var7 = var13.coord(var15.x, var15.y);
 			if (var7 == null) {
 					Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
@@ -357,7 +370,6 @@ public class GrandExchangeOffer {
 
 			return 1;
 		}
-						} else {
 		Coord var12;
 		if (var0 == 6619) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
@@ -365,13 +377,15 @@ public class GrandExchangeOffer {
 			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
 			ObjectSound.method1824(var3, var12, false);
 			return 1;
-							} else if (var0 == 6620) {
+		}
+		if (var0 == 6620) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
 			ObjectSound.method1824(var3, var12, true);
 			return 1;
-							} else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
@@ -379,15 +393,16 @@ public class GrandExchangeOffer {
 			if (var11 == null) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
 				return 1;
-								} else {
+			}
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0;
 			return 1;
 		}
-							} else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
+		if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith();
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight();
 			return 1;
-							} else if (var0 == 6623) {
+		}
+		if (var0 == 6623) {
 			var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
 			if (var13 == null) {
@@ -397,40 +412,48 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-							} else if (var0 == 6624) {
+		}
+		if (var0 == 6624) {
 			WorldMapID.getWorldMap().method6337(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			return 1;
-							} else if (var0 == 6625) {
+		}
+		if (var0 == 6625) {
 			WorldMapID.getWorldMap().method6338();
 			return 1;
-							} else if (var0 == 6626) {
+		}
+		if (var0 == 6626) {
 			WorldMapID.getWorldMap().method6339(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			return 1;
-							} else if (var0 == 6627) {
+		}
+		if (var0 == 6627) {
 			WorldMapID.getWorldMap().method6340();
 			return 1;
-							} else {
+		}
 		boolean var10;
 		if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
 			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			WorldMapID.getWorldMap().setPerpetualFlash(var10);
 			return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			WorldMapID.getWorldMap().flashElement(var3);
 			return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			WorldMapID.getWorldMap().flashCategory(var3);
 			return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
 			WorldMapID.getWorldMap().stopCurrentFlashes();
 			return 1;
-								} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
 			var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			WorldMapID.getWorldMap().setElementsDisabled(var10);
 			return 1;
-								} else {
+		}
 		boolean var4;
 		if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
@@ -438,24 +461,29 @@ public class GrandExchangeOffer {
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
 			WorldMapID.getWorldMap().disableElement(var3, var4);
 			return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
 			WorldMapID.getWorldMap().setCategoryDisabled(var3, var4);
 			return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0;
 			return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0;
 			return 1;
-									} else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0;
 			return 1;
-									} else if (var0 == 6638) {
+		}
+		if (var0 == 6638) {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
@@ -467,7 +495,7 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-									} else {
+		}
 		AbstractWorldMapIcon var8;
 		if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
 			var8 = WorldMapID.getWorldMap().iconStart();
@@ -480,7 +508,8 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-										} else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
 			var8 = WorldMapID.getWorldMap().iconNext();
 			if (var8 == null) {
 				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
@@ -491,7 +520,7 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-										} else {
+		}
 		WorldMapElement var6;
 		if (var0 == ScriptOpcodes.MEC_TEXT) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
@@ -503,12 +532,14 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-											} else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
+		}
+		if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var6 = class222.getWorldMapElement(var3);
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize;
 			return 1;
-											} else if (var0 == ScriptOpcodes.MEC_CATEGORY) {
+		}
+		if (var0 == ScriptOpcodes.MEC_CATEGORY) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var6 = class222.getWorldMapElement(var3);
 			if (var6 == null) {
@@ -518,7 +549,8 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-											} else if (var0 == ScriptOpcodes.MEC_SPRITE) {
+		}
+		if (var0 == ScriptOpcodes.MEC_SPRITE) {
 			var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
 			var6 = class222.getWorldMapElement(var3);
 			if (var6 == null) {
@@ -528,28 +560,21 @@ public class GrandExchangeOffer {
 			}
 
 			return 1;
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement;
 			return 1;
-											} else if (var0 == 6698) {
+		}
+		if (var0 == 6698) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed();
 			return 1;
-											} else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
+		}
+		if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed();
 			return 1;
-											} else {
+		}
 		return 2;
 	}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 
 	@ObfuscatedName("fk")
 	@ObfuscatedSignature(

runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java

@@ -116,24 +116,28 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 		if (var0 == ScriptOpcodes.CC_GETX) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETY) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETY) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETWIDTH) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETHIDE) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETHIDE) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETLAYER) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETLAYER) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId;
 			return 1;
-		} else {
-			return 2;
 		}
+		return 2;
 	}
 
 	@ObfuscatedName("hb")
@@ -175,7 +179,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 		if (var1 == 205) {
 			Client.field700 = 250;
 			return true;
-		} else {
+		}
 		int var2;
 		int var3;
 		if (var1 >= 300 && var1 <= 313) {
@@ -203,9 +207,7 @@ final class GrandExchangeOfferAgeComparator implements Comparator {
 			Client.playerAppearance.method3995(var4.packetBuffer);
 			Client.packetWriter.method2219(var4);
 			return true;
-			} else {
+		}
 		return false;
 	}
-		}
-	}
 }

runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java

@@ -31,7 +31,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 	int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) {
 		if (var2.world == var1.world) {
 			return 0;
-		} else {
+		}
 		if (this.filterWorlds) {
 			if (Client.worldId == var1.world) {
 				return -1;
@@ -44,7 +44,6 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
 
 		return var1.world < var2.world ? -1 : 1;
 	}
-	}
 
 	public boolean equals(Object var1) {
 		return super.equals(var1);

runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java

@@ -95,11 +95,10 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 	static String method54(IterableNodeHashTable var0, int var1, String var2) {
 		if (var0 == null) {
 			return var2;
-		} else {
+		}
 		ObjectNode var3 = (ObjectNode)var0.get((long)var1);
 		return var3 == null ? var2 : (String)var3.obj;
 	}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
@@ -110,7 +109,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0);
 		var1 = new VarpDefinition();
 		if (var2 != null) {
@@ -120,7 +119,6 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 		VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
@@ -129,7 +127,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator {
 	)
 	@Export("openURL")
 	public static void openURL(String var0, boolean var1, boolean var2) {
-		class326.method6243(var0, var1, "openjs", var2);
+		SpriteBuffer.method6243(var0, var1, "openjs", var2);
 	}
 
 	@ObfuscatedName("gn")

runescape-client/src/main/java/GraphicsObject.java

@@ -225,12 +225,10 @@ public final class GraphicsObject extends Entity {
 			var3.onStockTransmit = var8;
 		} else if (var0 == 1426) {
 			var3.field2681 = var8;
-		} else {
+		} else if (var0 == ScriptOpcodes.CC_SETONRESIZE) {
-			if (var0 != ScriptOpcodes.CC_SETONRESIZE) {
-				return 2;
-			}
-
 			var3.onResize = var8;
+		} else {
+			return 2;
 		}
 
 		var3.hasListener = true;
@@ -245,7 +243,7 @@ public final class GraphicsObject extends Entity {
 	static final int method1948(int var0, int var1) {
 		if (var0 == -1) {
 			return 12345678;
-		} else {
+		}
 		var1 = (var0 & 127) * var1 / 128;
 		if (var1 < 2) {
 			var1 = 2;
@@ -255,7 +253,6 @@ public final class GraphicsObject extends Entity {
 
 		return (var0 & 65408) + var1;
 	}
-	}
 
 	@ObfuscatedName("az")
 	@ObfuscatedSignature(

runescape-client/src/main/java/HealthBar.java

@@ -85,14 +85,12 @@ public class HealthBar extends Node {
 
 			if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) {
 				return var2;
-			} else {
+			}
 			var2.remove();
 			return null;
 		}
-		} else {
 		return null;
 	}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(

runescape-client/src/main/java/HealthBarDefinition.java

@@ -167,20 +167,18 @@ public class HealthBarDefinition extends DualNode {
 	public Sprite getFrontSprite() {
 		if (this.frontSpriteID < 0) {
 			return null;
-		} else {
+		}
 		Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
-				var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
+		var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0);
 		if (var1 != null) {
 			HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 		}
 
 		return var1;
 	}
-		}
-	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
@@ -191,18 +189,16 @@ public class HealthBarDefinition extends DualNode {
 	public Sprite getBackSprite() {
 		if (this.backSpriteID < 0) {
 			return null;
-		} else {
+		}
 		Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
-				var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
+		var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0);
 		if (var1 != null) {
 			HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 		}
 
 		return var1;
 	}
-		}
-	}
 }

runescape-client/src/main/java/HealthBarUpdate.java

@@ -89,7 +89,7 @@ public class HealthBarUpdate extends Node {
 	static boolean method1676(String var0) {
 		if (var0 == null) {
 			return false;
-		} else {
+		}
 		try {
 			new URL(var0);
 			return true;
@@ -97,7 +97,6 @@ public class HealthBarUpdate extends Node {
 			return false;
 		}
 	}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
@@ -210,15 +209,16 @@ public class HealthBarUpdate extends Node {
 		int var3 = var1.readInt();
 		if (var3 < 0 || AbstractArchive.field3143 != 0 && var3 > AbstractArchive.field3143) {
 			throw new RuntimeException();
-		} else if (var2 == 0) {
+		}
+		if (var2 == 0) {
 			byte[] var4 = new byte[var3];
 			var1.readBytes(var4, 0, var3);
 			return var4;
-		} else {
+		}
 		int var6 = var1.readInt();
 		if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) {
 			throw new RuntimeException();
-			} else {
+		}
 		byte[] var5 = new byte[var6];
 		if (var2 == 1) {
 			BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9);
@@ -228,8 +228,6 @@ public class HealthBarUpdate extends Node {
 
 		return var5;
 	}
-		}
-	}
 
 	@ObfuscatedName("fd")
 	@ObfuscatedSignature(

runescape-client/src/main/java/HitSplatDefinition.java

@@ -285,20 +285,18 @@ public class HitSplatDefinition extends DualNode {
 	public Sprite method4551() {
 		if (this.field3334 < 0) {
 			return null;
-		} else {
+		}
 		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
-				var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3334, 0);
+		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3334, 0);
 		if (var1 != null) {
 			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334);
 		}
 
 		return var1;
 	}
-		}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -308,20 +306,18 @@ public class HitSplatDefinition extends DualNode {
 	public Sprite method4557() {
 		if (this.field3336 < 0) {
 			return null;
-		} else {
+		}
 		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
-				var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3336, 0);
+		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3336, 0);
 		if (var1 != null) {
 			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336);
 		}
 
 		return var1;
 	}
-		}
-	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
@@ -331,20 +327,18 @@ public class HitSplatDefinition extends DualNode {
 	public Sprite method4558() {
 		if (this.field3337 < 0) {
 			return null;
-		} else {
+		}
 		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
-				var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3337, 0);
+		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3337, 0);
 		if (var1 != null) {
 			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337);
 		}
 
 		return var1;
 	}
-		}
-	}
 
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
@@ -354,20 +348,18 @@ public class HitSplatDefinition extends DualNode {
 	public Sprite method4583() {
 		if (this.field3338 < 0) {
 			return null;
-		} else {
+		}
 		Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
-				var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3338, 0);
+		var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3338, 0);
 		if (var1 != null) {
 			HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338);
 		}
 
 		return var1;
 	}
-		}
-	}
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
@@ -378,19 +370,19 @@ public class HitSplatDefinition extends DualNode {
 	public Font getFont() {
 		if (this.fontId == -1) {
 			return null;
-		} else {
+		}
 		Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
 		if (var1 != null) {
 			return var1;
-			} else {
+		}
 		AbstractArchive var3 = HitSplatDefinition_spritesArchive;
 		AbstractArchive var4 = HitSplatDefinition_fontsArchive;
 		int var5 = this.fontId;
 		Font var2;
-				if (!Friend.doesSpriteExist(var3, var5, 0)) {
+		if (!Friend.SpriteBuffer_bufferFile(var3, var5, 0)) {
 			var2 = null;
 		} else {
-					var2 = WallDecoration.getWorldMapSprite(var4.takeFile(var5, 0));
+			var2 = WallDecoration.SpriteBuffer_createFont(var4.takeFile(var5, 0));
 		}
 
 		if (var2 != null) {
@@ -399,8 +391,6 @@ public class HitSplatDefinition extends DualNode {
 
 		return var2;
 	}
-		}
-	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(

runescape-client/src/main/java/Huffman.java

@@ -159,7 +159,7 @@ public class Huffman {
 	int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
 		if (var5 == 0) {
 			return 0;
-		} else {
+		}
 		int var6 = 0;
 		var5 += var4;
 		int var7 = var2;
@@ -292,7 +292,6 @@ public class Huffman {
 
 		return var7 + 1 - var2;
 	}
-	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(

runescape-client/src/main/java/Ignored.java

@@ -62,10 +62,10 @@ public class Ignored extends User {
 	public static boolean isCharPrintable(char var0) {
 		if (var0 >= ' ' && var0 <= '~') {
 			return true;
-		} else if (var0 >= 160 && var0 <= 255) {
+		}
+		if (var0 >= 160 && var0 <= 255) {
 			return true;
-		} else {
+		}
 		return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
 	}
-	}
 }

runescape-client/src/main/java/Instrument.java

@@ -152,7 +152,7 @@ public class Instrument {
 		class301.clearIntArray(Instrument_samples, 0, var1);
 		if (var2 < 10) {
 			return Instrument_samples;
-		} else {
+		}
 		double var3 = (double)var1 / ((double)var2 + 0.0D);
 		this.pitch.reset();
 		this.volume.reset();
@@ -351,20 +351,20 @@ public class Instrument {
 
 		return Instrument_samples;
 	}
-	}
 
 	@ObfuscatedName("w")
 	@Export("evaluateWave")
 	final int evaluateWave(int var1, int var2, int var3) {
 		if (var3 == 1) {
 			return (var1 & 32767) < 16384 ? var2 : -var2;
-		} else if (var3 == 2) {
-			return Instrument_sine[var1 & 32767] * var2 >> 14;
-		} else if (var3 == 3) {
-			return (var2 * (var1 & 32767) >> 14) - var2;
-		} else {
-			return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0;
 		}
+		if (var3 == 2) {
+			return Instrument_sine[var1 & 32767] * var2 >> 14;
+		}
+		if (var3 == 3) {
+			return (var2 * (var1 & 32767) >> 14) - var2;
+		}
+		return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0;
 	}
 
 	@ObfuscatedName("e")

runescape-client/src/main/java/Interpreter.java

@@ -102,7 +102,7 @@ public class Interpreter {
 	static final boolean method1936(int var0) {
 		if (var0 < 0) {
 			return false;
-		} else {
+		}
 		int var1 = Client.menuOpcodes[var0];
 		if (var1 >= 2000) {
 			var1 -= 2000;
@@ -110,7 +110,6 @@ public class Interpreter {
 
 		return var1 == 1007;
 	}
-	}
 
 	@ObfuscatedName("jo")
 	@ObfuscatedSignature(

runescape-client/src/main/java/ItemContainer.java

@@ -42,7 +42,7 @@ public class ItemContainer extends Node {
 		FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0);
 		var1 = new FloorUnderlayDefinition();
 		if (var2 != null) {
@@ -53,7 +53,6 @@ public class ItemContainer extends Node {
 		FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("ac")
 	@ObfuscatedSignature(

runescape-client/src/main/java/ItemDefinition.java

@@ -611,7 +611,7 @@ public class ItemDefinition extends DualNode {
 		ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0);
 		if (var4 == null) {
 			return null;
-		} else {
+		}
 		if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
 			var4.method2786(this.resizeX, this.resizeY, this.resizeZ);
 		}
@@ -630,7 +630,6 @@ public class ItemDefinition extends DualNode {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
@@ -656,11 +655,11 @@ public class ItemDefinition extends DualNode {
 		Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id);
 		if (var5 != null) {
 			return var5;
-		} else {
+		}
 		ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0);
 		if (var6 == null) {
 			return null;
-			} else {
+		}
 		if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
 			var6.method2786(this.resizeX, this.resizeY, this.resizeZ);
 		}
@@ -683,8 +682,6 @@ public class ItemDefinition extends DualNode {
 		ItemDefinition_cachedModels.put(var5, (long)this.id);
 		return var5;
 	}
-		}
-	}
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
@@ -727,7 +724,7 @@ public class ItemDefinition extends DualNode {
 
 		if (var2 == -1) {
 			return true;
-		} else {
+		}
 		boolean var5 = true;
 		if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
 			var5 = false;
@@ -743,7 +740,6 @@ public class ItemDefinition extends DualNode {
 
 		return var5;
 	}
-	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
@@ -762,7 +758,7 @@ public class ItemDefinition extends DualNode {
 
 		if (var2 == -1) {
 			return null;
-		} else {
+		}
 		ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0);
 		if (var3 != -1) {
 			ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0);
@@ -799,7 +795,6 @@ public class ItemDefinition extends DualNode {
 
 		return var5;
 	}
-	}
 
 	@ObfuscatedName("y")
 	@ObfuscatedSignature(
@@ -816,7 +811,7 @@ public class ItemDefinition extends DualNode {
 
 		if (var2 == -1) {
 			return true;
-		} else {
+		}
 		boolean var4 = true;
 		if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
 			var4 = false;
@@ -828,7 +823,6 @@ public class ItemDefinition extends DualNode {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("g")
 	@ObfuscatedSignature(
@@ -845,7 +839,7 @@ public class ItemDefinition extends DualNode {
 
 		if (var2 == -1) {
 			return null;
-		} else {
+		}
 		ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0);
 		if (var3 != -1) {
 			ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0);
@@ -868,7 +862,6 @@ public class ItemDefinition extends DualNode {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("a")
 	@ObfuscatedSignature(
@@ -913,13 +906,11 @@ public class ItemDefinition extends DualNode {
 		if (this.shiftClickIndex != -1 && this.inventoryActions != null) {
 			if (this.shiftClickIndex >= 0) {
 				return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1;
-			} else {
+			}
 			return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1;
 		}
-		} else {
 		return -1;
 	}
-	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(

runescape-client/src/main/java/IterableDualNodeQueue.java

@@ -60,11 +60,10 @@ public class IterableDualNodeQueue implements Iterable {
 		DualNode var1 = this.sentinel.previousDual;
 		if (var1 == this.sentinel) {
 			return null;
-		} else {
+		}
 		var1.removeDual();
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("k")
 	@ObfuscatedSignature(
@@ -91,11 +90,10 @@ public class IterableDualNodeQueue implements Iterable {
 		if (var2 == this.sentinel) {
 			this.head = null;
 			return null;
-		} else {
+		}
 		this.head = var2.previousDual;
 		return var2;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -107,11 +105,10 @@ public class IterableDualNodeQueue implements Iterable {
 		if (var1 == this.sentinel) {
 			this.head = null;
 			return null;
-		} else {
+		}
 		this.head = var1.previousDual;
 		return var1;
 	}
-	}
 
 	public Iterator iterator() {
 		return new IterableDualNodeQueueIterator(this);

runescape-client/src/main/java/IterableDualNodeQueueIterator.java

@@ -56,9 +56,8 @@ public class IterableDualNodeQueueIterator implements Iterator {
 	public void remove() {
 		if (this.last == null) {
 			throw new IllegalStateException();
-		} else {
+		}
 		this.last.removeDual();
 		this.last = null;
 	}
-	}
 }

runescape-client/src/main/java/IterableNodeDeque.java

@@ -91,11 +91,10 @@ public class IterableNodeDeque implements Iterable, Collection {
 		if (var2 == this.sentinel) {
 			this.field3538 = null;
 			return null;
-		} else {
+		}
 		this.field3538 = var2.previous;
 		return var2;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -107,11 +106,10 @@ public class IterableNodeDeque implements Iterable, Collection {
 		if (var1 == this.sentinel) {
 			this.field3538 = null;
 			return null;
-		} else {
+		}
 		this.field3538 = var1.previous;
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("i")
 	int method4884() {
@@ -125,7 +123,7 @@ public class IterableNodeDeque implements Iterable, Collection {
 	}
 
 	@ObfuscatedName("c")
-	@Export("isEmpty")
+	@Export("rsIsEmpty")
 	public boolean rsIsEmpty() {
 		return this.sentinel.previous == this.sentinel;
 	}

runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java

@@ -53,11 +53,10 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
 	public void remove() {
 		if (this.last == null) {
 			throw new IllegalStateException();
-		} else {
+		}
 		this.last.remove();
 		this.last = null;
 	}
-	}
 
 	public Object next() {
 		Node var1 = this.field3549;

runescape-client/src/main/java/IterableNodeHashTable.java

@@ -124,7 +124,7 @@ public final class IterableNodeHashTable implements Iterable {
 			var1 = this.current;
 			this.current = var1.previous;
 			return var1;
-		} else {
+		}
 		do {
 			if (this.index >= this.size) {
 				return null;
@@ -136,7 +136,6 @@ public final class IterableNodeHashTable implements Iterable {
 		this.current = var1.previous;
 		return var1;
 	}
-	}
 
 	public Iterator iterator() {
 		return new IterableNodeHashTableIterator(this);

runescape-client/src/main/java/IterableNodeHashTableIterator.java

@@ -49,7 +49,7 @@ public class IterableNodeHashTableIterator implements Iterator {
 	public boolean hasNext() {
 		if (this.hashTable.buckets[this.index - 1] != this.head) {
 			return true;
-		} else {
+		}
 		while (this.index < this.hashTable.size) {
 			if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) {
 				this.head = this.hashTable.buckets[this.index - 1].previous;
@@ -61,7 +61,6 @@ public class IterableNodeHashTableIterator implements Iterator {
 
 		return false;
 	}
-	}
 
 	public Object next() {
 		Node var1;
@@ -70,7 +69,7 @@ public class IterableNodeHashTableIterator implements Iterator {
 			this.head = var1.previous;
 			this.last = var1;
 			return var1;
-		} else {
+		}
 		do {
 			if (this.index >= this.hashTable.size) {
 				return null;
@@ -83,14 +82,12 @@ public class IterableNodeHashTableIterator implements Iterator {
 		this.last = var1;
 		return var1;
 	}
-	}
 
 	public void remove() {
 		if (this.last == null) {
 			throw new IllegalStateException();
-		} else {
+		}
 		this.last.remove();
 		this.last = null;
 	}
-	}
 }

runescape-client/src/main/java/KitDefinition.java

@@ -135,7 +135,7 @@ public class KitDefinition extends DualNode {
 	public boolean ready() {
 		if (this.models2 == null) {
 			return true;
-		} else {
+		}
 		boolean var1 = true;
 
 		for (int var2 = 0; var2 < this.models2.length; ++var2) {
@@ -146,7 +146,6 @@ public class KitDefinition extends DualNode {
 
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
@@ -157,7 +156,7 @@ public class KitDefinition extends DualNode {
 	public ModelData getModelData() {
 		if (this.models2 == null) {
 			return null;
-		} else {
+		}
 		ModelData[] var1 = new ModelData[this.models2.length];
 
 		for (int var2 = 0; var2 < this.models2.length; ++var2) {
@@ -186,7 +185,6 @@ public class KitDefinition extends DualNode {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(

runescape-client/src/main/java/LinkDeque.java

@@ -51,11 +51,10 @@ public class LinkDeque {
 		if (var1 == this.sentinel) {
 			this.current = null;
 			return null;
-		} else {
+		}
 		this.current = var1.previous;
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
@@ -67,9 +66,8 @@ public class LinkDeque {
 		if (var1 == this.sentinel) {
 			this.current = null;
 			return null;
-		} else {
+		}
 		this.current = var1.previous;
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/MenuAction.java

@@ -152,7 +152,7 @@ public class MenuAction {
 		var17 = var3 - var4;
 		if (var17 != 0) {
 			return var17;
-		} else {
+		}
 		for (int var19 = 0; var19 < var16; ++var19) {
 			var20 = var0.charAt(var19);
 			char var13 = var1.charAt(var19);
@@ -163,7 +163,6 @@ public class MenuAction {
 
 		return 0;
 	}
-	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
@@ -185,50 +184,63 @@ public class MenuAction {
 		if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollX;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollY;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETTEXT) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETTEXT) {
 			Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.text;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollWidth;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollHeight;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelZoom;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleX;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleZ;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleY;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETTRANSTOP) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyTop;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETTRANSBOT) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyBot;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color2;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETFILLMODE) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETFILLMODE) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
+		}
+		if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
 			return 1;
-		} else {
+		}
 		return 2;
 	}
-	}
 }

runescape-client/src/main/java/MidiFileReader.java

@@ -151,7 +151,7 @@ public class MidiFileReader {
 
 		if (var5 != 240 && var5 != 247) {
 			return this.method3840(var1, var5);
-		} else {
+		}
 		int var3 = this.buffer.readVarInt();
 		if (var5 == 247 && var3 > 0) {
 			int var4 = this.buffer.array[this.buffer.offset] & 255;
@@ -166,7 +166,6 @@ public class MidiFileReader {
 		var10000.offset += var3;
 		return 0;
 	}
-	}
 
 	@ObfuscatedName("x")
 	int method3840(int var1, int var2) {
@@ -179,7 +178,8 @@ public class MidiFileReader {
 				var10000 = this.buffer;
 				var10000.offset += var4;
 				return 1;
-			} else if (var7 == 81) {
+			}
+			if (var7 == 81) {
 				int var5 = this.buffer.readMedium();
 				var4 -= 3;
 				int var6 = this.trackLengths[var1];
@@ -188,12 +188,11 @@ public class MidiFileReader {
 				var10000 = this.buffer;
 				var10000.offset += var4;
 				return 2;
-			} else {
+			}
 			var10000 = this.buffer;
 			var10000.offset += var4;
 			return 3;
 		}
-		} else {
 		byte var3 = field2468[var2 - 128];
 		var4 = var2;
 		if (var3 >= 1) {
@@ -206,7 +205,6 @@ public class MidiFileReader {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("r")
 	long method3861(int var1) {

runescape-client/src/main/java/MidiPcmStream.java

@@ -221,6 +221,7 @@ public class MidiPcmStream extends PcmStream {
 	@ObfuscatedSignature(
 		signature = "()Ldx;"
 	)
+	@Export("firstSubStream")
 	protected synchronized PcmStream firstSubStream() {
 		return this.patchStream;
 	}
@@ -229,6 +230,7 @@ public class MidiPcmStream extends PcmStream {
 	@ObfuscatedSignature(
 		signature = "()Ldx;"
 	)
+	@Export("nextSubStream")
 	protected synchronized PcmStream nextSubStream() {
 		return null;
 	}
@@ -976,9 +978,8 @@ public class MidiPcmStream extends PcmStream {
 			}
 
 			return true;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	@ObfuscatedName("bp")
@@ -1066,11 +1067,10 @@ public class MidiPcmStream extends PcmStream {
 				}
 
 				return true;
-			} else {
+			}
 			var1.stream.method2536(var1.field2455, this.method3731(var1), this.method3732(var1));
 			return false;
 		}
-		} else {
 		var1.method3826();
 		var1.remove();
 		if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) {
@@ -1079,7 +1079,6 @@ public class MidiPcmStream extends PcmStream {
 
 		return true;
 	}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(

runescape-client/src/main/java/MilliClock.java

@@ -126,8 +126,7 @@ public class MilliClock extends Clock {
 	static int method3468(int var0, int var1, int var2) {
 		if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) {
 			return 0;
-		} else {
+		}
 		return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0;
 	}
-	}
 }

runescape-client/src/main/java/Model.java

@@ -381,7 +381,7 @@ public class Model extends Entity {
 			var10 = var10 + 127 >> 7;
 			if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
 				return this;
-			} else {
+			}
 			Model var11;
 			if (var5) {
 				var11 = new Model();
@@ -456,10 +456,8 @@ public class Model extends Entity {
 			var11.resetBounds();
 			return var11;
 		}
-		} else {
 		return this;
 	}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(

runescape-client/src/main/java/ModelData.java

@@ -1046,7 +1046,7 @@ public class ModelData extends Entity {
 			var10 = var10 + 127 >> 7;
 			if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
 				return this;
-			} else {
+			}
 			ModelData var11 = new ModelData();
 			var11.verticesCount = this.verticesCount;
 			var11.faceCount = this.faceCount;
@@ -1118,10 +1118,8 @@ public class ModelData extends Entity {
 			var11.invalidate();
 			return var11;
 		}
-		} else {
 		return this;
 	}
-	}
 
 	@ObfuscatedName("b")
 	void method2777() {

runescape-client/src/main/java/ModelData0.java

@@ -88,7 +88,8 @@ public class ModelData0 {
 			}
 
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
+		}
+		if (var0 == ScriptOpcodes.CC_SETSIZE) {
 			HealthBarUpdate.Interpreter_intStackSize -= 4;
 			var4.rawWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4.rawHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -101,7 +102,8 @@ public class ModelData0 {
 			}
 
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
+		}
+		if (var0 == ScriptOpcodes.CC_SETHIDE) {
 			boolean var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			if (var5 != var4.isHidden) {
 				var4.isHidden = var5;
@@ -109,14 +111,15 @@ public class ModelData0 {
 			}
 
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
+		}
+		if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
 			var4.noClickThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			return 1;
-		} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
+		}
+		if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
 			var4.noScrollThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
 			return 1;
-		} else {
+		}
 		return 2;
 	}
-	}
 }

runescape-client/src/main/java/MouseHandler.java

@@ -161,9 +161,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		int var2 = var1.getButton();
 		if (!var1.isAltDown() && var2 != 2) {
 			return !var1.isMetaDown() && var2 != 3 ? 1 : 2;
-		} else {
-			return 4;
 		}
+		return 4;
 	}
 
 	public final synchronized void mouseMoved(MouseEvent var1) {
@@ -258,9 +257,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 
 		if (var1 == 1) {
 			return var0 * var2;
-		} else {
-			return var2;
 		}
+		return var2;
 	}
 
 	@ObfuscatedName("e")
@@ -299,7 +297,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		var0.exportIndex();
 		if (var1 != 0) {
 			throw new RuntimeException();
-		} else {
+		}
 		var0.importIndex();
 
 		for (var2 = 0; var2 < Players.Players_count; ++var2) {
@@ -325,7 +323,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		var0.exportIndex();
 		if (var1 != 0) {
 			throw new RuntimeException();
-			} else {
+		}
 		var0.importIndex();
 
 		for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
@@ -352,7 +350,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		var0.exportIndex();
 		if (var1 != 0) {
 			throw new RuntimeException();
-				} else {
+		}
 		var0.importIndex();
 
 		for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
@@ -379,7 +377,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		var0.exportIndex();
 		if (var1 != 0) {
 			throw new RuntimeException();
-					} else {
+		}
 		Players.Players_count = 0;
 		Players.Players_emptyIdxCount = 0;
 
@@ -395,10 +393,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 		}
 
 	}
-				}
-			}
-		}
-	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(

runescape-client/src/main/java/MusicPatch.java

@@ -536,7 +536,7 @@ public class MusicPatch extends Node {
 		SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
 		var1 = new SpotAnimationDefinition();
 		var1.id = var0;
@@ -547,7 +547,6 @@ public class MusicPatch extends Node {
 		SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(

runescape-client/src/main/java/MusicPatchNode2.java

@@ -65,8 +65,7 @@ public class MusicPatchNode2 {
 		Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
 		if (var1 == null) {
 			return -1;
-		} else {
+		}
 		return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count;
 	}
-	}
 }

runescape-client/src/main/java/MusicPatchPcmStream.java

@@ -128,9 +128,8 @@ public class MusicPatchPcmStream extends PcmStream {
 		MusicPatchNode var1 = (MusicPatchNode)this.queue.last();
 		if (var1 == null) {
 			return null;
-		} else {
-			return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream());
 		}
+		return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream());
 	}
 
 	@ObfuscatedName("b")

runescape-client/src/main/java/NPC.java

@@ -134,13 +134,13 @@ public final class NPC extends Actor {
 	protected final Model getModel() {
 		if (this.definition == null) {
 			return null;
-		} else {
+		}
 		SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null;
 		SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null;
 		Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
 		if (var3 == null) {
 			return null;
-			} else {
+		}
 		var3.calculateBoundsCylinder();
 		super.defaultHeight = var3.height;
 		if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
@@ -158,8 +158,6 @@ public final class NPC extends Actor {
 
 		return var3;
 	}
-		}
-	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
@@ -179,78 +177,112 @@ public final class NPC extends Actor {
 	static int method1977(int var0, Script var1, boolean var2) {
 		if (var0 < 1000) {
 			return Skeleton.method3064(var0, var1, var2);
-		} else if (var0 < 1100) {
+		}
+		if (var0 < 1100) {
 			return ModelData0.method3250(var0, var1, var2);
-		} else if (var0 < 1200) {
+		}
+		if (var0 < 1200) {
 			return class83.method1994(var0, var1, var2);
-		} else if (var0 < 1300) {
+		}
+		if (var0 < 1300) {
 			return WorldMapDecoration.method324(var0, var1, var2);
-		} else if (var0 < 1400) {
+		}
+		if (var0 < 1400) {
 			return UserComparator9.method3389(var0, var1, var2);
-		} else if (var0 < 1500) {
+		}
+		if (var0 < 1500) {
 			return GraphicsObject.method1943(var0, var1, var2);
-		} else if (var0 < 1600) {
+		}
+		if (var0 < 1600) {
 			return GrandExchangeOfferAgeComparator.method147(var0, var1, var2);
-		} else if (var0 < 1700) {
+		}
+		if (var0 < 1700) {
 			return MenuAction.method1992(var0, var1, var2);
-		} else if (var0 < 1800) {
+		}
+		if (var0 < 1800) {
 			return class169.method3501(var0, var1, var2);
-		} else if (var0 < 1900) {
+		}
+		if (var0 < 1900) {
 			return StudioGame.method4137(var0, var1, var2);
-		} else if (var0 < 2000) {
+		}
+		if (var0 < 2000) {
 			return ArchiveLoader.method1100(var0, var1, var2);
-		} else if (var0 < 2100) {
+		}
+		if (var0 < 2100) {
 			return ModelData0.method3250(var0, var1, var2);
-		} else if (var0 < 2200) {
+		}
+		if (var0 < 2200) {
 			return class83.method1994(var0, var1, var2);
-		} else if (var0 < 2300) {
+		}
+		if (var0 < 2300) {
 			return WorldMapDecoration.method324(var0, var1, var2);
-		} else if (var0 < 2400) {
+		}
+		if (var0 < 2400) {
 			return UserComparator9.method3389(var0, var1, var2);
-		} else if (var0 < 2500) {
+		}
+		if (var0 < 2500) {
 			return GraphicsObject.method1943(var0, var1, var2);
-		} else if (var0 < 2600) {
+		}
+		if (var0 < 2600) {
 			return ScriptEvent.method1127(var0, var1, var2);
-		} else if (var0 < 2700) {
+		}
+		if (var0 < 2700) {
 			return TextureProvider.method2743(var0, var1, var2);
-		} else if (var0 < 2800) {
+		}
+		if (var0 < 2800) {
 			return UrlRequester.method3306(var0, var1, var2);
-		} else if (var0 < 2900) {
+		}
+		if (var0 < 2900) {
 			return FloorUnderlayDefinition.method4433(var0, var1, var2);
-		} else if (var0 < 3000) {
+		}
+		if (var0 < 3000) {
 			return ArchiveLoader.method1100(var0, var1, var2);
-		} else if (var0 < 3200) {
+		}
+		if (var0 < 3200) {
 			return class30.method536(var0, var1, var2);
-		} else if (var0 < 3300) {
+		}
+		if (var0 < 3300) {
 			return AbstractArchive.method4172(var0, var1, var2);
-		} else if (var0 < 3400) {
+		}
+		if (var0 < 3400) {
 			return WorldMapID.method540(var0, var1, var2);
-		} else if (var0 < 3500) {
+		}
+		if (var0 < 3500) {
 			return class65.method1175(var0, var1, var2);
-		} else if (var0 < 3700) {
+		}
+		if (var0 < 3700) {
 			return class30.method535(var0, var1, var2);
-		} else if (var0 < 4000) {
+		}
+		if (var0 < 4000) {
 			return FriendSystem.method1817(var0, var1, var2);
-		} else if (var0 < 4100) {
+		}
+		if (var0 < 4100) {
 			return EnumDefinition.method4532(var0, var1, var2);
-		} else if (var0 < 4200) {
+		}
+		if (var0 < 4200) {
 			return class208.method3941(var0, var1, var2);
-		} else if (var0 < 4300) {
+		}
+		if (var0 < 4300) {
 			return FontName.method5316(var0, var1, var2);
-		} else if (var0 < 5100) {
+		}
+		if (var0 < 5100) {
 			return ClientPreferences.method1753(var0, var1, var2);
-		} else if (var0 < 5400) {
+		}
+		if (var0 < 5400) {
 			return UserComparator6.method3436(var0, var1, var2);
-		} else if (var0 < 5600) {
+		}
+		if (var0 < 5600) {
 			return WorldMapSectionType.method239(var0, var1, var2);
-		} else if (var0 < 5700) {
+		}
+		if (var0 < 5700) {
 			return WorldMapData_1.method696(var0, var1, var2);
-		} else if (var0 < 6300) {
+		}
+		if (var0 < 6300) {
 			return WorldMapSectionType.method242(var0, var1, var2);
-		} else if (var0 < 6600) {
+		}
+		if (var0 < 6600) {
 			return class197.method3703(var0, var1, var2);
-		} else {
+		}
 		return var0 < 6700 ? GrandExchangeOffer.method114(var0, var1, var2) : 2;
 	}
-	}
 }

runescape-client/src/main/java/NPCDefinition.java

@@ -389,7 +389,7 @@ public class NPCDefinition extends DualNode {
 		if (this.transforms != null) {
 			NPCDefinition var12 = this.transform();
 			return var12 == null ? null : var12.getModel(var1, var2, var3, var4);
-		} else {
+		}
 		Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
 		if (var5 == null) {
 			boolean var6 = false;
@@ -451,7 +451,6 @@ public class NPCDefinition extends DualNode {
 
 		return var10;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -463,9 +462,10 @@ public class NPCDefinition extends DualNode {
 		if (this.transforms != null) {
 			NPCDefinition var1 = this.transform();
 			return var1 == null ? null : var1.getModelData();
-		} else if (this.field3463 == null) {
+		}
+		if (this.field3463 == null) {
 			return null;
-		} else {
+		}
 		boolean var5 = false;
 
 		for (int var2 = 0; var2 < this.field3463.length; ++var2) {
@@ -476,7 +476,7 @@ public class NPCDefinition extends DualNode {
 
 		if (var5) {
 			return null;
-			} else {
+		}
 		ModelData[] var6 = new ModelData[this.field3463.length];
 
 		for (int var3 = 0; var3 < this.field3463.length; ++var3) {
@@ -505,8 +505,6 @@ public class NPCDefinition extends DualNode {
 
 		return var7;
 	}
-		}
-	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
@@ -541,7 +539,7 @@ public class NPCDefinition extends DualNode {
 	public boolean transformIsVisible() {
 		if (this.transforms == null) {
 			return true;
-		} else {
+		}
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
 			var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit);
@@ -551,11 +549,9 @@ public class NPCDefinition extends DualNode {
 
 		if (var1 >= 0 && var1 < this.transforms.length) {
 			return this.transforms[var1] != -1;
-			} else {
+		}
 		return this.transforms[this.transforms.length - 1] != -1;
 	}
-		}
-	}
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(

runescape-client/src/main/java/NetSocket.java

@@ -146,9 +146,8 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 	public boolean isAvailable(int var1) throws IOException {
 		if (this.isClosed) {
 			return false;
-		} else {
-			return this.inputStream.available() >= var1;
 		}
+		return this.inputStream.available() >= var1;
 	}
 
 	@ObfuscatedName("k")
@@ -160,7 +159,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 	public int read(byte[] var1, int var2, int var3) throws IOException {
 		if (this.isClosed) {
 			return 0;
-		} else {
+		}
 		int var4;
 		int var5;
 		for (var4 = var3; var3 > 0; var3 -= var5) {
@@ -174,7 +173,6 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
@@ -187,7 +185,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 			if (this.exceptionWriting) {
 				this.exceptionWriting = false;
 				throw new IOException();
-			} else {
+			}
 			if (this.outBuffer == null) {
 				this.outBuffer = new byte[this.bufferLength];
 			}
@@ -209,7 +207,6 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 			}
 		}
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -358,7 +355,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 		InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0);
 		var1 = new InvDefinition();
 		if (var2 != null) {
@@ -368,7 +365,6 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 		InvDefinition.InvDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(

runescape-client/src/main/java/NodeDeque.java

@@ -80,11 +80,10 @@ public class NodeDeque {
 		Node var1 = this.sentinel.previous;
 		if (var1 == this.sentinel) {
 			return null;
-		} else {
+		}
 		var1.remove();
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
@@ -95,11 +94,10 @@ public class NodeDeque {
 		Node var1 = this.sentinel.next;
 		if (var1 == this.sentinel) {
 			return null;
-		} else {
+		}
 		var1.remove();
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -111,11 +109,10 @@ public class NodeDeque {
 		if (var1 == this.sentinel) {
 			this.current = null;
 			return null;
-		} else {
+		}
 		this.current = var1.previous;
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
@@ -127,11 +124,10 @@ public class NodeDeque {
 		if (var1 == this.sentinel) {
 			this.current = null;
 			return null;
-		} else {
+		}
 		this.current = var1.next;
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
@@ -143,11 +139,10 @@ public class NodeDeque {
 		if (var1 == this.sentinel) {
 			this.current = null;
 			return null;
-		} else {
+		}
 		this.current = var1.previous;
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
@@ -159,11 +154,10 @@ public class NodeDeque {
 		if (var1 == this.sentinel) {
 			this.current = null;
 			return null;
-		} else {
+		}
 		this.current = var1.next;
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("p")
 	@ObfuscatedSignature(

runescape-client/src/main/java/NodeHashTable.java

@@ -103,7 +103,7 @@ public final class NodeHashTable {
 			var1 = this.current;
 			this.current = var1.previous;
 			return var1;
-		} else {
+		}
 		do {
 			if (this.index >= this.size) {
 				return null;
@@ -115,5 +115,4 @@ public final class NodeHashTable {
 		this.current = var1.previous;
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/ObjectDefinition.java

@@ -532,11 +532,13 @@ public class ObjectDefinition extends DualNode {
 			}
 
 			return true;
-		} else if (this.field3362 == null) {
+		}
+		if (this.field3362 == null) {
 			return true;
-		} else if (var1 != 10) {
+		}
+		if (var1 != 10) {
 			return true;
-		} else {
+		}
 		boolean var2 = true;
 
 		for (int var3 = 0; var3 < this.field3362.length; ++var3) {
@@ -545,7 +547,6 @@ public class ObjectDefinition extends DualNode {
 
 		return var2;
 	}
-	}
 
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
@@ -555,7 +556,7 @@ public class ObjectDefinition extends DualNode {
 	public final boolean method4608() {
 		if (this.field3362 == null) {
 			return true;
-		} else {
+		}
 		boolean var1 = true;
 
 		for (int var2 = 0; var2 < this.field3362.length; ++var2) {
@@ -564,7 +565,6 @@ public class ObjectDefinition extends DualNode {
 
 		return var1;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -672,7 +672,7 @@ public class ObjectDefinition extends DualNode {
 
 		if (var7 == null && this.clipType * 256 == -1) {
 			return var11;
-		} else {
+		}
 		if (var7 != null) {
 			var11 = var7.transformObjectModel(var11, var8, var2);
 		} else {
@@ -685,7 +685,6 @@ public class ObjectDefinition extends DualNode {
 
 		return var11;
 	}
-	}
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
@@ -893,7 +892,7 @@ public class ObjectDefinition extends DualNode {
 	public boolean method4598() {
 		if (this.transforms == null) {
 			return this.ambientSoundId != -1 || this.field3367 != null;
-		} else {
+		}
 		for (int var1 = 0; var1 < this.transforms.length; ++var1) {
 			if (this.transforms[var1] != -1) {
 				ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]);
@@ -905,5 +904,4 @@ public class ObjectDefinition extends DualNode {
 
 		return false;
 	}
-	}
 }

runescape-client/src/main/java/ObjectSound.java

@@ -140,12 +140,11 @@ public final class ObjectSound extends Node {
 		Script var5 = class49.getWorldMapScript(var3, var0);
 		if (var5 != null) {
 			return var5;
-		} else {
+		}
 		int var4 = GraphicsDefaults.getWorldMapScriptIdCategory(var2, var0);
 		var5 = class49.getWorldMapScript(var4, var0);
 		return var5 != null ? var5 : null;
 	}
-	}
 
 	@ObfuscatedName("ai")
 	@ObfuscatedSignature(

runescape-client/src/main/java/PacketBuffer.java

@@ -169,22 +169,21 @@ public class PacketBuffer extends Buffer {
 		signature = "(Lhp;III)Llx;",
 		garbageValue = "-1232611828"
 	)
-	@Export("loadIndexedSprite")
+	@Export("SpriteBuffer_getIndexedSprite")
-	static IndexedSprite loadIndexedSprite(AbstractArchive var0, int var1, int var2) {
+	static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) {
-		if (!Friend.doesSpriteExist(var0, var1, var2)) {
+		if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) {
 			return null;
-		} else {
+		}
 		IndexedSprite var4 = new IndexedSprite();
-			var4.width = class326.SpriteBuffer_spriteWidth;
+		var4.width = SpriteBuffer.SpriteBuffer_spriteWidth;
-			var4.height = class326.SpriteBuffer_spriteHeight;
+		var4.height = SpriteBuffer.SpriteBuffer_spriteHeight;
 		var4.xOffset = Varps.SpriteBuffer_xOffsets[0];
-			var4.yOffset = class326.SpriteBuffer_yOffsets[0];
+		var4.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0];
-			var4.subWidth = class326.SpriteBuffer_spriteWidths[0];
+		var4.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0];
 		var4.subHeight = class216.SpriteBuffer_spriteHeights[0];
 		var4.palette = Frames.SpriteBuffer_spritePalette;
-			var4.pixels = class326.SpriteBuffer_pixels[0];
+		var4.pixels = SpriteBuffer.SpriteBuffer_pixels[0];
-			class16.method174();
+		class16.SpriteBuffer_clear();
 		return var4;
 	}
-	}
 }

runescape-client/src/main/java/PacketBufferNode.java

@@ -153,13 +153,14 @@ public class PacketBufferNode extends Node {
 
 		if (var0 == 338) {
 			return 'O';
-		} else if (var0 == 339) {
-			return 'o';
-		} else if (var0 == 376) {
-			return 'Y';
-		} else {
-			return var0;
 		}
+		if (var0 == 339) {
+			return 'o';
+		}
+		if (var0 == 376) {
+			return 'Y';
+		}
+		return var0;
 	}
 
 	@ObfuscatedName("gi")

runescape-client/src/main/java/ParamDefinition.java

@@ -130,7 +130,7 @@ public class ParamDefinition extends DualNode {
 		StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
 		var1 = new StructDefinition();
 		if (var2 != null) {
@@ -141,5 +141,4 @@ public class ParamDefinition extends DualNode {
 		StructDefinition.StructDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/PcmPlayer.java

@@ -111,6 +111,7 @@ public class PcmPlayer {
 		signature = "(I)V",
 		garbageValue = "-1518489339"
 	)
+	@Export("init")
 	protected void init() throws Exception {
 	}
 
@@ -119,6 +120,7 @@ public class PcmPlayer {
 		signature = "(IB)V",
 		garbageValue = "2"
 	)
+	@Export("open")
 	protected void open(int var1) throws Exception {
 	}
 
@@ -133,6 +135,7 @@ public class PcmPlayer {
 	}
 
 	@ObfuscatedName("p")
+	@Export("write")
 	protected void write() throws Exception {
 	}
 

runescape-client/src/main/java/PcmStreamMixer.java

@@ -93,6 +93,7 @@ public class PcmStreamMixer extends PcmStream {
 	@ObfuscatedSignature(
 		signature = "()Ldx;"
 	)
+	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		return (PcmStream)this.subStreams.last();
 	}
@@ -101,6 +102,7 @@ public class PcmStreamMixer extends PcmStream {
 	@ObfuscatedSignature(
 		signature = "()Ldx;"
 	)
+	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
 		return (PcmStream)this.subStreams.previous();
 	}

runescape-client/src/main/java/Player.java

@@ -374,13 +374,13 @@ public final class Player extends Actor {
 	protected final Model getModel() {
 		if (this.appearance == null) {
 			return null;
-		} else {
+		}
 		SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null;
 		SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null;
 		Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
 		if (var3 == null) {
 			return null;
-			} else {
+		}
 		var3.calculateBoundsCylinder();
 		super.defaultHeight = var3.height;
 		Model var4;
@@ -433,8 +433,6 @@ public final class Player extends Actor {
 		var3.isSingleTile = true;
 		return var3;
 	}
-		}
-	}
 
 	@ObfuscatedName("u")
 	@ObfuscatedSignature(
@@ -521,9 +519,10 @@ public final class Player extends Actor {
 			try {
 				if (!class51.field434.startsWith("win")) {
 					throw new Exception();
-				} else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
+				}
+				if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
 					throw new Exception();
-				} else {
+				}
 				String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
 
 				for (int var4 = 0; var4 < var0.length(); ++var4) {
@@ -534,25 +533,27 @@ public final class Player extends Actor {
 
 				Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
 				return true;
-				}
 			} catch (Throwable var5) {
 				return false;
 			}
-		} else if (var1 == 1) {
+		}
+		if (var1 == 1) {
 			try {
 				Object var10 = class47.method806(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()});
 				return var10 != null;
 			} catch (Throwable var6) {
 				return false;
 			}
-		} else if (var1 == 2) {
+		}
+		if (var1 == 2) {
 			try {
 				class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank");
 				return true;
 			} catch (Exception var7) {
 				return false;
 			}
-		} else if (var1 == 3) {
+		}
+		if (var1 == 3) {
 			try {
 				Applet var3 = class51.applet;
 				JSObject.getWindow(var3).call("loggedout", (Object[])null);
@@ -565,9 +566,8 @@ public final class Player extends Actor {
 			} catch (Exception var8) {
 				return false;
 			}
-		} else {
-			throw new IllegalArgumentException();
 		}
+		throw new IllegalArgumentException();
 	}
 
 	@ObfuscatedName("ff")

runescape-client/src/main/java/PlayerAppearance.java

@@ -238,7 +238,7 @@ public class PlayerAppearance {
 	public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
 		if (this.npcTransformId != -1) {
 			return GameShell.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4);
-		} else {
+		}
 		long var5 = this.field2539;
 		int[] var7 = this.equipment;
 		if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
@@ -328,7 +328,7 @@ public class PlayerAppearance {
 
 		if (var1 == null && var3 == null) {
 			return var8;
-			} else {
+		}
 		Model var18;
 		if (var1 != null && var3 != null) {
 			var18 = var1.applyTransformations(var8, var2, var3, var4);
@@ -340,8 +340,6 @@ public class PlayerAppearance {
 
 		return var18;
 	}
-		}
-	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
@@ -352,7 +350,7 @@ public class PlayerAppearance {
 	ModelData getModelData() {
 		if (this.npcTransformId != -1) {
 			return GameShell.getNpcDefinition(this.npcTransformId).getModelData();
-		} else {
+		}
 		boolean var1 = false;
 
 		int var3;
@@ -369,7 +367,7 @@ public class PlayerAppearance {
 
 		if (var1) {
 			return null;
-			} else {
+		}
 		ModelData[] var7 = new ModelData[12];
 		var3 = 0;
 
@@ -406,8 +404,6 @@ public class PlayerAppearance {
 
 		return var8;
 	}
-		}
-	}
 
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
@@ -424,14 +420,13 @@ public class PlayerAppearance {
 		signature = "(Lhp;II)Z",
 		garbageValue = "-435811450"
 	)
-	@Export("SpriteBuffer_loadSpriteFlat")
+	@Export("SpriteBuffer_bufferFileFlat")
-	public static boolean SpriteBuffer_loadSpriteFlat(AbstractArchive var0, int var1) {
+	public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) {
 		byte[] var2 = var0.takeFileFlat(var1);
 		if (var2 == null) {
 			return false;
-		} else {
+		}
 		class185.SpriteBuffer_decode(var2);
 		return true;
 	}
-	}
 }

runescape-client/src/main/java/Projectile.java

@@ -231,11 +231,10 @@ public final class Projectile extends Entity {
 		Model var2 = var1.getModel(this.frame);
 		if (var2 == null) {
 			return null;
-		} else {
+		}
 		var2.rotateZ(this.pitch);
 		return var2;
 	}
-	}
 
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
@@ -247,7 +246,7 @@ public final class Projectile extends Entity {
 		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
-		} else {
+		}
 		byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0);
 		var1 = new HitSplatDefinition();
 		if (var2 != null) {
@@ -257,5 +256,4 @@ public final class Projectile extends Entity {
 		HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0);
 		return var1;
 	}
-	}
 }

runescape-client/src/main/java/Rasterizer3D.java

@@ -358,7 +358,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var6 += var20;
 								var0 += Rasterizer2D.Rasterizer2D_width;
 							}
-						} else {
+						}
 						var2 -= var1;
 						var1 -= var0;
 						var0 = Rasterizer3D_rowOffsets[var0];
@@ -387,7 +387,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var0 += Rasterizer2D.Rasterizer2D_width;
 						}
 					}
-					} else {
 					var4 = var3 <<= 14;
 					if (var0 < 0) {
 						var4 -= var0 * var17;
@@ -430,7 +429,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var6 += var20;
 							var0 += Rasterizer2D.Rasterizer2D_width;
 						}
-						} else {
+					}
 					var1 -= var2;
 					var2 -= var0;
 					var0 = Rasterizer3D_rowOffsets[var0];
@@ -459,8 +458,6 @@ public class Rasterizer3D extends Rasterizer2D {
 						var0 += Rasterizer2D.Rasterizer2D_width;
 					}
 				}
-					}
-				}
 			} else if (var1 <= var2) {
 				if (var1 < Rasterizer3D_clipHeight) {
 					if (var2 > Rasterizer3D_clipHeight) {
@@ -515,7 +512,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var7 += var20;
 								var1 += Rasterizer2D.Rasterizer2D_width;
 							}
-						} else {
+						}
 						var0 -= var2;
 						var2 -= var1;
 						var1 = Rasterizer3D_rowOffsets[var1];
@@ -544,7 +541,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var1 += Rasterizer2D.Rasterizer2D_width;
 						}
 					}
-					} else {
 					var5 = var4 <<= 14;
 					if (var1 < 0) {
 						var5 -= var16 * var1;
@@ -587,7 +583,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var7 += var20;
 							var1 += Rasterizer2D.Rasterizer2D_width;
 						}
-						} else {
+					}
 					var2 -= var0;
 					var0 -= var1;
 					var1 = Rasterizer3D_rowOffsets[var1];
@@ -616,8 +612,6 @@ public class Rasterizer3D extends Rasterizer2D {
 						var1 += Rasterizer2D.Rasterizer2D_width;
 					}
 				}
-					}
-				}
 			} else if (var2 < Rasterizer3D_clipHeight) {
 				if (var0 > Rasterizer3D_clipHeight) {
 					var0 = Rasterizer3D_clipHeight;
@@ -671,7 +665,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var8 += var20;
 							var2 += Rasterizer2D.Rasterizer2D_width;
 						}
-					} else {
+					}
 					var1 -= var0;
 					var0 -= var2;
 					var2 = Rasterizer3D_rowOffsets[var2];
@@ -700,7 +694,6 @@ public class Rasterizer3D extends Rasterizer2D {
 						var2 += Rasterizer2D.Rasterizer2D_width;
 					}
 				}
-				} else {
 				var3 = var5 <<= 14;
 				if (var2 < 0) {
 					var3 -= var15 * var2;
@@ -743,7 +736,7 @@ public class Rasterizer3D extends Rasterizer2D {
 						var8 += var20;
 						var2 += Rasterizer2D.Rasterizer2D_width;
 					}
-					} else {
+				}
 				var0 -= var1;
 				var1 -= var2;
 				var2 = Rasterizer3D_rowOffsets[var2];
@@ -774,8 +767,6 @@ public class Rasterizer3D extends Rasterizer2D {
 			}
 		}
 	}
-		}
-	}
 
 	@ObfuscatedName("x")
 	@Export("Rasterizer3D_vertAlpha")
@@ -947,7 +938,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var3 += var7;
 							var0 += Rasterizer2D.Rasterizer2D_width;
 						}
-					} else {
+					}
 					var2 -= var1;
 					var1 -= var0;
 					var0 = Rasterizer3D_rowOffsets[var0];
@@ -974,7 +965,6 @@ public class Rasterizer3D extends Rasterizer2D {
 						var0 += Rasterizer2D.Rasterizer2D_width;
 					}
 				}
-				} else {
 				var4 = var3 <<= 14;
 				if (var0 < 0) {
 					var4 -= var0 * var9;
@@ -1014,7 +1004,7 @@ public class Rasterizer3D extends Rasterizer2D {
 						var3 += var7;
 						var0 += Rasterizer2D.Rasterizer2D_width;
 					}
-					} else {
+				}
 				var1 -= var2;
 				var2 -= var0;
 				var0 = Rasterizer3D_rowOffsets[var0];
@@ -1041,8 +1031,6 @@ public class Rasterizer3D extends Rasterizer2D {
 					var0 += Rasterizer2D.Rasterizer2D_width;
 				}
 			}
-				}
-			}
 		} else if (var1 <= var2) {
 			if (var1 < Rasterizer3D_clipHeight) {
 				if (var2 > Rasterizer3D_clipHeight) {
@@ -1093,7 +1081,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var4 += var8;
 							var1 += Rasterizer2D.Rasterizer2D_width;
 						}
-					} else {
+					}
 					var0 -= var2;
 					var2 -= var1;
 					var1 = Rasterizer3D_rowOffsets[var1];
@@ -1120,7 +1108,6 @@ public class Rasterizer3D extends Rasterizer2D {
 						var1 += Rasterizer2D.Rasterizer2D_width;
 					}
 				}
-				} else {
 				var5 = var4 <<= 14;
 				if (var1 < 0) {
 					var5 -= var7 * var1;
@@ -1160,7 +1147,7 @@ public class Rasterizer3D extends Rasterizer2D {
 						var4 += var8;
 						var1 += Rasterizer2D.Rasterizer2D_width;
 					}
-					} else {
+				}
 				var2 -= var0;
 				var0 -= var1;
 				var1 = Rasterizer3D_rowOffsets[var1];
@@ -1187,8 +1174,6 @@ public class Rasterizer3D extends Rasterizer2D {
 					var1 += Rasterizer2D.Rasterizer2D_width;
 				}
 			}
-				}
-			}
 		} else if (var2 < Rasterizer3D_clipHeight) {
 			if (var0 > Rasterizer3D_clipHeight) {
 				var0 = Rasterizer3D_clipHeight;
@@ -1238,7 +1223,7 @@ public class Rasterizer3D extends Rasterizer2D {
 						var5 += var9;
 						var2 += Rasterizer2D.Rasterizer2D_width;
 					}
-				} else {
+				}
 				var1 -= var0;
 				var0 -= var2;
 				var2 = Rasterizer3D_rowOffsets[var2];
@@ -1265,7 +1250,6 @@ public class Rasterizer3D extends Rasterizer2D {
 					var2 += Rasterizer2D.Rasterizer2D_width;
 				}
 			}
-			} else {
 			var3 = var5 <<= 14;
 			if (var2 < 0) {
 				var3 -= var8 * var2;
@@ -1305,7 +1289,7 @@ public class Rasterizer3D extends Rasterizer2D {
 					var5 += var9;
 					var2 += Rasterizer2D.Rasterizer2D_width;
 				}
-				} else {
+			}
 			var0 -= var1;
 			var1 -= var2;
 			var2 = Rasterizer3D_rowOffsets[var2];
@@ -1333,8 +1317,6 @@ public class Rasterizer3D extends Rasterizer2D {
 			}
 		}
 	}
-		}
-	}
 
 	@ObfuscatedName("v")
 	@Export("Rasterizer3D_horizAlpha")
@@ -1374,7 +1356,7 @@ public class Rasterizer3D extends Rasterizer2D {
 						var0[var1++] = var0[var1];
 						var0[var1++] = var0[var1];
 					}
-				} else {
+				}
 				int var6 = Rasterizer3D_alpha;
 				int var7 = 256 - Rasterizer3D_alpha;
 				var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935);
@@ -1406,7 +1388,6 @@ public class Rasterizer3D extends Rasterizer2D {
 					var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280);
 				}
 			}
-			} else {
 			while (true) {
 				--var3;
 				if (var3 < 0) {
@@ -1429,7 +1410,6 @@ public class Rasterizer3D extends Rasterizer2D {
 			}
 		}
 	}
-	}
 
 	@ObfuscatedName("y")
 	static final void method2986(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) {
@@ -1546,7 +1526,7 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37;
 									var38 += var40;
 								}
-							} else {
+							}
 							var2 -= var1;
 							var1 -= var0;
 							var0 = Rasterizer3D_rowOffsets[var0];
@@ -1581,7 +1561,6 @@ public class Rasterizer3D extends Rasterizer2D {
 								var38 += var40;
 							}
 						}
-						} else {
 						var4 = var3 <<= 14;
 						if (var0 < 0) {
 							var4 -= var0 * var28;
@@ -1634,7 +1613,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var35 += var37;
 								var38 += var40;
 							}
-							} else {
+						}
 						var1 -= var2;
 						var2 -= var0;
 						var0 = Rasterizer3D_rowOffsets[var0];
@@ -1669,8 +1648,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var38 += var40;
 						}
 					}
-						}
-					}
 				} else if (var1 <= var2) {
 					if (var1 < Rasterizer3D_clipHeight) {
 						if (var2 > Rasterizer3D_clipHeight) {
@@ -1735,7 +1712,7 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37;
 									var38 += var40;
 								}
-							} else {
+							}
 							var0 -= var2;
 							var2 -= var1;
 							var1 = Rasterizer3D_rowOffsets[var1];
@@ -1770,7 +1747,6 @@ public class Rasterizer3D extends Rasterizer2D {
 								var38 += var40;
 							}
 						}
-						} else {
 						var5 = var4 <<= 14;
 						if (var1 < 0) {
 							var5 -= var26 * var1;
@@ -1823,7 +1799,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var35 += var37;
 								var38 += var40;
 							}
-							} else {
+						}
 						var2 -= var0;
 						var0 -= var1;
 						var1 = Rasterizer3D_rowOffsets[var1];
@@ -1858,8 +1834,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var38 += var40;
 						}
 					}
-						}
-					}
 				} else if (var2 < Rasterizer3D_clipHeight) {
 					if (var0 > Rasterizer3D_clipHeight) {
 						var0 = Rasterizer3D_clipHeight;
@@ -1923,7 +1897,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var35 += var37;
 								var38 += var40;
 							}
-						} else {
+						}
 						var1 -= var0;
 						var0 -= var2;
 						var2 = Rasterizer3D_rowOffsets[var2];
@@ -1958,7 +1932,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var38 += var40;
 						}
 					}
-					} else {
 					var3 = var5 <<= 14;
 					if (var2 < 0) {
 						var3 -= var27 * var2;
@@ -2011,7 +1984,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var35 += var37;
 							var38 += var40;
 						}
-						} else {
+					}
 					var0 -= var1;
 					var1 -= var2;
 					var2 = Rasterizer3D_rowOffsets[var2];
@@ -2049,8 +2022,6 @@ public class Rasterizer3D extends Rasterizer2D {
 			}
 		}
 	}
-		}
-	}
 
 	@ObfuscatedName("g")
 	@Export("Rasterizer3D_iDontKnow")
@@ -2588,7 +2559,7 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37;
 									var38 += var40;
 								}
-							} else {
+							}
 							var2 -= var1;
 							var1 -= var0;
 							var0 = Rasterizer3D_rowOffsets[var0];
@@ -2623,7 +2594,6 @@ public class Rasterizer3D extends Rasterizer2D {
 								var38 += var40;
 							}
 						}
-						} else {
 						var4 = var3 <<= 14;
 						if (var0 < 0) {
 							var4 -= var0 * var28;
@@ -2676,7 +2646,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var35 += var37;
 								var38 += var40;
 							}
-							} else {
+						}
 						var1 -= var2;
 						var2 -= var0;
 						var0 = Rasterizer3D_rowOffsets[var0];
@@ -2711,8 +2681,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var38 += var40;
 						}
 					}
-						}
-					}
 				} else if (var1 <= var2) {
 					if (var1 < Rasterizer3D_clipHeight) {
 						if (var2 > Rasterizer3D_clipHeight) {
@@ -2777,7 +2745,7 @@ public class Rasterizer3D extends Rasterizer2D {
 									var35 += var37;
 									var38 += var40;
 								}
-							} else {
+							}
 							var0 -= var2;
 							var2 -= var1;
 							var1 = Rasterizer3D_rowOffsets[var1];
@@ -2812,7 +2780,6 @@ public class Rasterizer3D extends Rasterizer2D {
 								var38 += var40;
 							}
 						}
-						} else {
 						var5 = var4 <<= 14;
 						if (var1 < 0) {
 							var5 -= var26 * var1;
@@ -2865,7 +2832,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var35 += var37;
 								var38 += var40;
 							}
-							} else {
+						}
 						var2 -= var0;
 						var0 -= var1;
 						var1 = Rasterizer3D_rowOffsets[var1];
@@ -2900,8 +2867,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var38 += var40;
 						}
 					}
-						}
-					}
 				} else if (var2 < Rasterizer3D_clipHeight) {
 					if (var0 > Rasterizer3D_clipHeight) {
 						var0 = Rasterizer3D_clipHeight;
@@ -2965,7 +2930,7 @@ public class Rasterizer3D extends Rasterizer2D {
 								var35 += var37;
 								var38 += var40;
 							}
-						} else {
+						}
 						var1 -= var0;
 						var0 -= var2;
 						var2 = Rasterizer3D_rowOffsets[var2];
@@ -3000,7 +2965,6 @@ public class Rasterizer3D extends Rasterizer2D {
 							var38 += var40;
 						}
 					}
-					} else {
 					var3 = var5 <<= 14;
 					if (var2 < 0) {
 						var3 -= var27 * var2;
@@ -3053,7 +3017,7 @@ public class Rasterizer3D extends Rasterizer2D {
 							var35 += var37;
 							var38 += var40;
 						}
-						} else {
+					}
 					var0 -= var1;
 					var1 -= var2;
 					var2 = Rasterizer3D_rowOffsets[var2];
@@ -3091,8 +3055,6 @@ public class Rasterizer3D extends Rasterizer2D {
 			}
 		}
 	}
-		}
-	}
 
 	@ObfuscatedName("j")
 	@Export("Rasterizer3D_textureAlpha")

runescape-client/src/main/java/RawPcmStream.java

@@ -81,6 +81,7 @@ public class RawPcmStream extends PcmStream {
 	@ObfuscatedSignature(
 		signature = "()Ldx;"
 	)
+	@Export("firstSubStream")
 	protected PcmStream firstSubStream() {
 		return null;
 	}
@@ -89,6 +90,7 @@ public class RawPcmStream extends PcmStream {
 	@ObfuscatedSignature(
 		signature = "()Ldx;"
 	)
+	@Export("nextSubStream")
 	protected PcmStream nextSubStream() {
 		return null;
 	}
@@ -163,7 +165,8 @@ public class RawPcmStream extends PcmStream {
 						this.field1471 = var5 + var5 - 1 - this.field1471;
 						this.field1469 = -this.field1469;
 					}
-				} else if (this.field1469 < 0) {
+				}
+				if (this.field1469 < 0) {
 					while (true) {
 						var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]);
 						if (this.field1471 >= var5) {
@@ -172,7 +175,7 @@ public class RawPcmStream extends PcmStream {
 
 						this.field1471 = var6 - 1 - (var6 - 1 - this.field1471) % var8;
 					}
-				} else {
+				}
 				while (true) {
 					var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]);
 					if (this.field1471 < var6) {
@@ -182,7 +185,6 @@ public class RawPcmStream extends PcmStream {
 					this.field1471 = var5 + (this.field1471 - var5) % var8;
 				}
 			}
-			} else {
 			if (this.numLoops > 0) {
 				if (this.field1478) {
 					label119: {
@@ -278,7 +280,6 @@ public class RawPcmStream extends PcmStream {
 
 		}
 	}
-	}
 
 	@ObfuscatedName("u")
 	@Export("setNumLoops")
@@ -768,11 +769,10 @@ public class RawPcmStream extends PcmStream {
 				this.field1472 = 0;
 				this.remove();
 				return true;
-			} else {
+			}
 			this.method2525();
 			return false;
 		}
-		} else {
 		if (this.field1472 < var1) {
 			this.field1480 = 1;
 			this.field1479 = var1 - this.field1472;
@@ -813,7 +813,6 @@ public class RawPcmStream extends PcmStream {
 
 		return false;
 	}
-	}
 
 	@ObfuscatedName("ay")
 	int vmethod2689() {

runescape-client/src/main/java/Scene.java

@@ -478,12 +478,11 @@ public class Scene {
 	public boolean method3076(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
 		if (var7 == null) {
 			return true;
-		} else {
+		}
 		int var12 = var5 * 64 + var2 * 128;
 		int var13 = var6 * 64 + var3 * 128;
 		return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11);
 	}
-	}
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
@@ -493,7 +492,7 @@ public class Scene {
 	public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
 		if (var6 == null) {
 			return true;
-		} else {
+		}
 		int var11 = var2 - var5;
 		int var12 = var3 - var5;
 		int var13 = var5 + var2;
@@ -522,7 +521,6 @@ public class Scene {
 		var14 /= 128;
 		return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0);
 	}
-	}
 
 	@ObfuscatedName("v")
 	@ObfuscatedSignature(
@@ -745,7 +743,7 @@ public class Scene {
 		Tile var4 = this.tiles[var1][var2][var3];
 		if (var4 == null) {
 			return null;
-		} else {
+		}
 		for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
 			GameObject var6 = var4.gameObjects[var5];
 			long var8 = var6.tag;
@@ -757,7 +755,6 @@ public class Scene {
 
 		return null;
 	}
-	}
 
 	@ObfuscatedName("ad")
 	@ObfuscatedSignature(
@@ -789,7 +786,7 @@ public class Scene {
 		Tile var4 = this.tiles[var1][var2][var3];
 		if (var4 == null) {
 			return 0L;
-		} else {
+		}
 		for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
 			GameObject var6 = var4.gameObjects[var5];
 			long var8 = var6.tag;
@@ -801,7 +798,6 @@ public class Scene {
 
 		return 0L;
 	}
-	}
 
 	@ObfuscatedName("az")
 	@Export("getFloorDecorationTag")
@@ -816,13 +812,16 @@ public class Scene {
 		Tile var6 = this.tiles[var1][var2][var3];
 		if (var6 == null) {
 			return -1;
-		} else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
+		}
+		if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
 			return var6.boundaryObject.flags & 255;
-		} else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
+		}
+		if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
 			return var6.wallDecoration.flags & 255;
-		} else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
+		}
+		if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
 			return var6.floorDecoration.flags & 255;
-		} else {
+		}
 		for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
 			if (var6.gameObjects[var7].tag == var4) {
 				return var6.gameObjects[var7].flags & 255;
@@ -831,7 +830,6 @@ public class Scene {
 
 		return -1;
 	}
-	}
 
 	@ObfuscatedName("ao")
 	public void method3097(int var1, int var2, int var3) {
@@ -2129,26 +2127,25 @@ public class Scene {
 		int var4 = this.field1810[var1][var2][var3];
 		if (var4 == -Scene_drawnCount) {
 			return false;
-		} else if (var4 == Scene_drawnCount) {
+		}
+		if (var4 == Scene_drawnCount) {
 			return true;
-		} else {
+		}
 		int var5 = var2 << 7;
 		int var6 = var3 << 7;
 		if (this.method3102(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
 			this.field1810[var1][var2][var3] = Scene_drawnCount;
 			return true;
-			} else {
+		}
 		this.field1810[var1][var2][var3] = -Scene_drawnCount;
 		return false;
 	}
-		}
-	}
 
 	@ObfuscatedName("bi")
 	boolean method3194(int var1, int var2, int var3, int var4) {
 		if (!this.method3181(var1, var2, var3)) {
 			return false;
-		} else {
+		}
 		int var5 = var2 << 7;
 		int var6 = var3 << 7;
 		int var7 = this.tileHeights[var1][var2][var3] - 1;
@@ -2287,30 +2284,31 @@ public class Scene {
 
 		if (!this.method3102(var5 + 64, var10, var6 + 64)) {
 			return false;
-			} else if (var4 == 16) {
+		}
+		if (var4 == 16) {
 			return this.method3102(var5, var9, var6 + 128);
-			} else if (var4 == 32) {
+		}
+		if (var4 == 32) {
 			return this.method3102(var5 + 128, var9, var6 + 128);
-			} else if (var4 == 64) {
+		}
+		if (var4 == 64) {
 			return this.method3102(var5 + 128, var9, var6);
-			} else if (var4 == 128) {
+		}
+		if (var4 == 128) {
 			return this.method3102(var5, var9, var6);
-			} else {
+		}
 		return true;
 	}
-		}
-	}
 
 	@ObfuscatedName("bg")
 	boolean method3116(int var1, int var2, int var3, int var4) {
 		if (!this.method3181(var1, var2, var3)) {
 			return false;
-		} else {
+		}
 		int var5 = var2 << 7;
 		int var6 = var3 << 7;
 		return this.method3102(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
 	}
-	}
 
 	@ObfuscatedName("bh")
 	boolean method3117(int var1, int var2, int var3, int var4, int var5, int var6) {
@@ -2319,12 +2317,11 @@ public class Scene {
 		if (var3 == var2 && var5 == var4) {
 			if (!this.method3181(var1, var2, var4)) {
 				return false;
-			} else {
+			}
 			var7 = var2 << 7;
 			var8 = var4 << 7;
 			return this.method3102(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3102(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
 		}
-		} else {
 		for (var7 = var2; var7 <= var3; ++var7) {
 			for (var8 = var4; var8 <= var5; ++var8) {
 				if (this.field1810[var1][var7][var8] == -Scene_drawnCount) {
@@ -2338,23 +2335,20 @@ public class Scene {
 		int var9 = this.tileHeights[var1][var2][var4] - var6;
 		if (!this.method3102(var7, var9, var8)) {
 			return false;
-			} else {
+		}
 		int var10 = (var3 << 7) - 1;
 		if (!this.method3102(var10, var9, var8)) {
 			return false;
-				} else {
+		}
 		int var11 = (var5 << 7) - 1;
 		if (!this.method3102(var7, var9, var11)) {
 			return false;
-					} else if (!this.method3102(var10, var9, var11)) {
+		}
+		if (!this.method3102(var10, var9, var11)) {
 			return false;
-					} else {
+		}
 		return true;
 	}
-				}
-			}
-		}
-	}
 
 	@ObfuscatedName("bm")
 	boolean method3102(int var1, int var2, int var3) {
@@ -2538,9 +2532,8 @@ public class Scene {
 			int var7 = var3 * 128 / var5 + Scene_viewportXCenter;
 			int var8 = var6 * 128 / var5 + Scene_viewportYCenter;
 			return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax;
-		} else {
-			return false;
 		}
+		return false;
 	}
 
 	@ObfuscatedName("au")
@@ -2571,25 +2564,25 @@ public class Scene {
 	static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
 		if (var1 < var2 && var1 < var3 && var1 < var4) {
 			return false;
-		} else if (var1 > var2 && var1 > var3 && var1 > var4) {
+		}
+		if (var1 > var2 && var1 > var3 && var1 > var4) {
 			return false;
-		} else if (var0 < var5 && var0 < var6 && var0 < var7) {
+		}
+		if (var0 < var5 && var0 < var6 && var0 < var7) {
 			return false;
-		} else if (var0 > var5 && var0 > var6 && var0 > var7) {
+		}
+		if (var0 > var5 && var0 > var6 && var0 > var7) {
 			return false;
-		} else {
+		}
 		int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
 		int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
 		int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
 		if (var8 == 0) {
 			if (var9 != 0) {
 				return var9 < 0 ? var10 <= 0 : var10 >= 0;
-				} else {
+			}
 			return true;
 		}
-			} else {
 		return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
 	}
-		}
-	}
 }

runescape-client/src/main/java/ScriptEvent.java

@@ -138,24 +138,28 @@ public class ScriptEvent extends Node {
 		if (var0 == ScriptOpcodes.IF_GETX) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x;
 			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETY) {
+		}
+		if (var0 == ScriptOpcodes.IF_GETY) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y;
 			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETWIDTH) {
+		}
+		if (var0 == ScriptOpcodes.IF_GETWIDTH) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width;
 			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
+		}
+		if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height;
 			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETHIDE) {
+		}
+		if (var0 == ScriptOpcodes.IF_GETHIDE) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
 			return 1;
-		} else if (var0 == ScriptOpcodes.IF_GETLAYER) {
+		}
+		if (var0 == ScriptOpcodes.IF_GETLAYER) {
 			Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId;
 			return 1;
-		} else {
-			return 2;
 		}
+		return 2;
 	}
 
 	@ObfuscatedName("go")
@@ -178,9 +182,8 @@ public class ScriptEvent extends Node {
 			int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7;
 			int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7;
 			return var7 * var9 + var8 * (128 - var7) >> 7;
-		} else {
-			return 0;
 		}
+		return 0;
 	}
 
 	@ObfuscatedName("iq")

runescape-client/src/main/java/ScriptFrame.java

@@ -338,7 +338,7 @@ public class ScriptFrame {
 
 		if (var1.offset != Client.packetWriter.serverPacketLength) {
 			throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength);
-		} else {
+		}
 		for (var2 = 0; var2 < Client.npcCount; ++var2) {
 			if (Client.npcs[Client.npcIndices[var2]] == null) {
 				throw new RuntimeException(var2 + "," + Client.npcCount);
@@ -346,7 +346,6 @@ public class ScriptFrame {
 		}
 
 	}
-	}
 
 	@ObfuscatedName("hf")
 	@ObfuscatedSignature(

runescape-client/src/main/java/SequenceDefinition.java

@@ -249,12 +249,11 @@ public class SequenceDefinition extends DualNode {
 		var2 &= 65535;
 		if (var3 == null) {
 			return var1.toSharedSequenceModel(true);
-		} else {
+		}
 		Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2));
 		var4.animate(var3, var2);
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("l")
 	@ObfuscatedSignature(
@@ -268,7 +267,7 @@ public class SequenceDefinition extends DualNode {
 		var2 &= 65535;
 		if (var4 == null) {
 			return var1.toSharedSequenceModel(true);
-		} else {
+		}
 		Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2));
 		var3 &= 3;
 		if (var3 == 1) {
@@ -290,7 +289,6 @@ public class SequenceDefinition extends DualNode {
 
 		return var5;
 	}
-	}
 
 	@ObfuscatedName("b")
 	@ObfuscatedSignature(
@@ -304,12 +302,11 @@ public class SequenceDefinition extends DualNode {
 		var2 &= 65535;
 		if (var3 == null) {
 			return var1.toSharedSpotAnimationModel(true);
-		} else {
+		}
 		Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2));
 		var4.animate(var3, var2);
 		return var4;
 	}
-	}
 
 	@ObfuscatedName("i")
 	@ObfuscatedSignature(
@@ -323,7 +320,7 @@ public class SequenceDefinition extends DualNode {
 		var2 &= 65535;
 		if (var5 == null) {
 			return var3.transformActorModel(var1, var4);
-		} else {
+		}
 		var4 = var3.frameIds[var4];
 		Frames var6 = class30.getFrames(var4 >> 16);
 		var4 &= 65535;
@@ -332,13 +329,11 @@ public class SequenceDefinition extends DualNode {
 			var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2));
 			var7.animate(var5, var2);
 			return var7;
-			} else {
+		}
 		var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4));
 		var7.animate2(var5, var2, var6, var4, this.field3518);
 		return var7;
 	}
-		}
-	}
 
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
@@ -352,7 +347,7 @@ public class SequenceDefinition extends DualNode {
 		var3 &= 65535;
 		if (var4 == null) {
 			return var1.toSharedSequenceModel(true);
-		} else {
+		}
 		Frames var5 = null;
 		int var6 = 0;
 		if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) {
@@ -367,11 +362,9 @@ public class SequenceDefinition extends DualNode {
 			var7.animate(var4, var3);
 			var7.animate(var5, var6);
 			return var7;
-			} else {
+		}
 		var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3));
 		var7.animate(var4, var3);
 		return var7;
 	}
-		}
-	}
 }

runescape-client/src/main/java/Skeleton.java

@@ -150,7 +150,7 @@ public class Skeleton extends Node {
 			int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
 			if (var4 == 0) {
 				throw new RuntimeException();
-			} else {
+			}
 			Widget var6 = class80.getWidget(var3);
 			if (var6.children == null) {
 				var6.children = new Widget[var5 + 1];
@@ -168,7 +168,7 @@ public class Skeleton extends Node {
 
 			if (var5 > 0 && var6.children[var5 - 1] == null) {
 				throw new RuntimeException("" + (var5 - 1));
-				} else {
+			}
 			Widget var12 = new Widget();
 			var12.type = var4;
 			var12.parentId = var12.id = var6.id;
@@ -184,8 +184,6 @@ public class Skeleton extends Node {
 			Strings.method4120(var6);
 			return 1;
 		}
-			}
-		} else {
 		Widget var9;
 		if (var0 == ScriptOpcodes.CC_DELETE) {
 			var9 = var2 ? Interpreter.field1111 : Calendar.field2507;
@@ -193,30 +191,14 @@ public class Skeleton extends Node {
 			var10.children[var9.childIndex] = null;
 			Strings.method4120(var10);
 			return 1;
-			} else if (var0 == ScriptOpcodes.CC_DELETEALL) {
+		}
+		if (var0 == ScriptOpcodes.CC_DELETEALL) {
 			var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
 			var9.children = null;
 			Strings.method4120(var9);
 			return 1;
-			} else if (var0 != ScriptOpcodes.CC_FIND) {
-				if (var0 == ScriptOpcodes.IF_FIND) {
-					var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
-					if (var9 != null) {
-						Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1;
-						if (var2) {
-							Interpreter.field1111 = var9;
-						} else {
-							Calendar.field2507 = var9;
 		}
-					} else {
+		if (var0 == ScriptOpcodes.CC_FIND) {
-						Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
-					}
-
-					return 1;
-				} else {
-					return 2;
-				}
-			} else {
 			HealthBarUpdate.Interpreter_intStackSize -= 2;
 			var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
 			var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
@@ -234,6 +216,21 @@ public class Skeleton extends Node {
 
 			return 1;
 		}
+		if (var0 == ScriptOpcodes.IF_FIND) {
+			var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]);
+			if (var9 != null) {
+				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1;
+				if (var2) {
+					Interpreter.field1111 = var9;
+				} else {
+					Calendar.field2507 = var9;
 				}
+			} else {
+				Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0;
+			}
+
+			return 1;
+		}
+		return 2;
 	}
 }

runescape-client/src/main/java/SoundCache.java

@@ -60,13 +60,14 @@ public class SoundCache {
 		RawSound var7 = (RawSound)this.rawSounds.get(var5);
 		if (var7 != null) {
 			return var7;
-		} else if (var3 != null && var3[0] <= 0) {
+		}
+		if (var3 != null && var3[0] <= 0) {
 			return null;
-		} else {
+		}
 		SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2);
 		if (var8 == null) {
 			return null;
-			} else {
+		}
 		var7 = var8.toRawSound();
 		this.rawSounds.put(var7, var5);
 		if (var3 != null) {
@@ -75,8 +76,6 @@ public class SoundCache {
 
 		return var7;
 	}
-		}
-	}
 
 	@ObfuscatedName("w")
 	@ObfuscatedSignature(
@@ -91,9 +90,10 @@ public class SoundCache {
 		RawSound var7 = (RawSound)this.rawSounds.get(var5);
 		if (var7 != null) {
 			return var7;
-		} else if (var3 != null && var3[0] <= 0) {
+		}
+		if (var3 != null && var3[0] <= 0) {
 			return null;
-		} else {
+		}
 		VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5);
 		if (var8 == null) {
 			var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2);
@@ -107,13 +107,11 @@ public class SoundCache {
 		var7 = var8.toRawSound(var3);
 		if (var7 == null) {
 			return null;
-			} else {
+		}
 		var8.remove();
 		this.rawSounds.put(var7, var5);
 		return var7;
 	}
-		}
-	}
 
 	@ObfuscatedName("e")
 	@ObfuscatedSignature(
@@ -124,11 +122,11 @@ public class SoundCache {
 	public RawSound getSoundEffect(int var1, int[] var2) {
 		if (this.soundEffectIndex.getGroupCount() == 1) {
 			return this.getSoundEffect0(0, var1, var2);
-		} else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
-			return this.getSoundEffect0(var1, 0, var2);
-		} else {
-			throw new RuntimeException();
 		}
+		if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
+			return this.getSoundEffect0(var1, 0, var2);
+		}
+		throw new RuntimeException();
 	}
 
 	@ObfuscatedName("p")
@@ -140,11 +138,11 @@ public class SoundCache {
 	public RawSound getMusicSample(int var1, int[] var2) {
 		if (this.musicSampleIndex.getGroupCount() == 1) {
 			return this.getMusicSample0(0, var1, var2);
-		} else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
-			return this.getMusicSample0(var1, 0, var2);
-		} else {
-			throw new RuntimeException();
 		}
+		if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
+			return this.getMusicSample0(var1, 0, var2);
+		}
+		throw new RuntimeException();
 	}
 
 	@ObfuscatedName("eb")