project: Fix some fields manually

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

@@ -739,11 +739,11 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 						int var13 = this.advances[var7];
 						if (AbstractFont_strike != -1) {
-							Rasterizer2D.method7649(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
+							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
 						}
 
 						if (AbstractFont_underline != -1) {
-							Rasterizer2D.method7649(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
+							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
 						}
 
 						var2 += var13;
@@ -857,11 +857,11 @@ public abstract class AbstractFont extends Rasterizer2D {
 
 						int var18 = this.advances[var10];
 						if (AbstractFont_strike != -1) {
-							Rasterizer2D.method7649(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
+							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
 						}
 
 						if (AbstractFont_underline != -1) {
-							Rasterizer2D.method7649(var2, var3 + this.ascent, var18, AbstractFont_underline);
+							Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
 						}
 
 						var2 += var18;

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

@@ -175,7 +175,8 @@ public abstract class Actor extends Renderable {
 	@ObfuscatedGetter(
 		intValue = 892078037
 	)
-	int field1121;
+	@Export("movementFrameCycle")
+	int movementFrameCycle;
 	@ObfuscatedName("bv")
 	@ObfuscatedGetter(
 		intValue = -1419164143
@@ -330,7 +331,8 @@ public abstract class Actor extends Renderable {
 	@ObfuscatedSignature(
 		descriptor = "[Lgj;"
 	)
-	class185[] field1153;
+	@Export("pathTraversed")
+	class185[] pathTraversed;
 	@ObfuscatedName("ci")
 	@ObfuscatedGetter(
 		intValue = -154765815
@@ -375,7 +377,7 @@ public abstract class Actor extends Renderable {
 		this.field1122 = -1;
 		this.movementSequence = -1;
 		this.movementFrame = 0;
-		this.field1121 = 0;
+		this.movementFrameCycle = 0;
 		this.sequence = -1;
 		this.sequenceFrame = 0;
 		this.sequenceFrameCycle = 0;
@@ -393,7 +395,7 @@ public abstract class Actor extends Renderable {
 		this.pathLength = 0;
 		this.pathX = new int[10];
 		this.pathY = new int[10];
-		this.field1153 = new class185[10];
+		this.pathTraversed = new class185[10];
 		this.field1117 = 0;
 		this.field1098 = 0;
 		this.field1119 = -1;

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

@@ -406,8 +406,8 @@ public class Archive extends AbstractArchive {
 				int var8 = var0.transformedSize();
 				Client.field754.approxDestinationX = var1;
 				Client.field754.approxDestinationY = var2;
-				Client.field754.field2117 = 1;
+				Client.field754.approxDestinationSizeX = 1;
-				Client.field754.field2114 = 1;
+				Client.field754.approxDestinationSizeY = 1;
 				ApproximateRouteStrategy var9 = Client.field754;
 				ApproximateRouteStrategy var10 = var9;
 				CollisionMap var11 = Client.collisionMaps[var0.plane];
@@ -560,8 +560,8 @@ public class Archive extends AbstractArchive {
 						byte var38 = 10;
 						var39 = var10.approxDestinationX;
 						var23 = var10.approxDestinationY;
-						int var33 = var10.field2117;
+						int var33 = var10.approxDestinationSizeX;
-						var25 = var10.field2114;
+						var25 = var10.approxDestinationSizeY;
 
 						for (var26 = var39 - var38; var26 <= var38 + var39; ++var26) {
 							for (var27 = var23 - var38; var27 <= var23 + var38; ++var27) {

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

@@ -3414,13 +3414,13 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
 				var5.packetBuffer.writeInt(0);
 				var5.packetBuffer.writeInt(0);
 				var5.packetBuffer.method7407(WorldMapScaleHandler.archive6.hash);
-				var5.packetBuffer.writeIntME(class9.archive3.hash);
+				var5.packetBuffer.writeIntME(class9.archive1.hash);
 				var5.packetBuffer.method7407(ChatChannel.archive14.hash);
 				var5.packetBuffer.method7527(class1.archive13.hash);
 				var5.packetBuffer.writeInt(TaskHandler.archive12.hash);
 				var5.packetBuffer.writeInt(class148.archive19.hash);
 				var5.packetBuffer.method7407(class133.archive15.hash);
-				var5.packetBuffer.writeIntME(class19.archive4.hash);
+				var5.packetBuffer.writeIntME(class19.archive3.hash);
 				var5.packetBuffer.writeIntME(UserComparator6.archive8.hash);
 				var5.packetBuffer.method7527(class126.archive17.hash);
 				var5.packetBuffer.writeIntME(class115.archive7.hash);
@@ -3428,11 +3428,11 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
 				var5.packetBuffer.method7407(VertexNormal.archive18.hash);
 				var5.packetBuffer.writeInt(class140.archive5.hash);
 				var5.packetBuffer.writeIntME(class131.archive2.hash);
-				var5.packetBuffer.method7407(KeyHandler.field151.hash);
+				var5.packetBuffer.method7407(KeyHandler.archive4.hash);
 				var5.packetBuffer.writeIntME(NetSocket.archive9.hash);
 				var5.packetBuffer.writeInt(class257.archive10.hash);
 				var5.packetBuffer.method7407(HealthBarUpdate.archive20.hash);
-				var5.packetBuffer.method7407(class115.archive1.hash);
+				var5.packetBuffer.method7407(class115.archive0.hash);
 				var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset);
 				var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14);
 				packetWriter.addNode(var5);
@@ -4082,7 +4082,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
 								SoundEffect var32 = soundEffects[var1];
 								if (var32 == null) {
 									var10000 = null;
-									var32 = SoundEffect.readSoundEffect(KeyHandler.field151, soundEffectIds[var1], 0);
+									var32 = SoundEffect.readSoundEffect(KeyHandler.archive4, soundEffectIds[var1], 0);
 									if (var32 == null) {
 										continue;
 									}
@@ -4752,7 +4752,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
 					if (var5.stream1 == null) {
 						if (var5.soundEffectId >= 0) {
 							var10000 = null;
-							SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectId, 0);
+							SoundEffect var8 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectId, 0);
 							if (var8 != null) {
 								RawSound var9 = var8.toRawSound().resample(BoundaryObject.decimator);
 								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var9, 100, var7);
@@ -4769,7 +4769,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthTokens {
 						if (var5.soundEffectIds != null && (var5.field789 -= var4) <= 0) {
 							int var12 = (int)(Math.random() * (double)var5.soundEffectIds.length);
 							var10000 = null;
-							SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.field151, var5.soundEffectIds[var12], 0);
+							SoundEffect var13 = SoundEffect.readSoundEffect(KeyHandler.archive4, var5.soundEffectIds[var12], 0);
 							if (var13 != null) {
 								RawSound var14 = var13.toRawSound().resample(BoundaryObject.decimator);
 								RawPcmStream var11 = RawPcmStream.createRawPcmStream(var14, 100, var7);

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

@@ -183,7 +183,7 @@ public class Decimator {
 				var8 = var7 >> 28;
 				var9 = var7 >> 14 & 255;
 				var10 = var7 & 255;
-				var11.field1153[0] = Players.field1246[var1];
+				var11.pathTraversed[0] = Players.field1246[var1];
 				var11.plane = (byte)var8;
 				var11.resetPath((var9 << 13) + var3 - class131.baseX, (var10 << 13) + var4 - TileItem.baseY);
 				var11.field1055 = false;

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

@@ -1,10 +1,12 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("pg")
-public enum class429 implements MouseWheel {
+@Implements("FillMode")
+public enum FillMode implements MouseWheel {
 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "Lpg;"
@@ -33,7 +35,7 @@ public enum class429 implements MouseWheel {
 	)
 	final int field4551;
 
-	class429(int var3, int var4) {
+	FillMode(int var3, int var4) {
 		this.field4554 = var3;
 		this.field4551 = var4;
 	}

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

@@ -16,13 +16,14 @@ public class HealthBarDefinition extends DualNode {
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
-	@Export("HealthBarDefinition_cachedSprites")
+	@Export("HealthBarDefinition_cached")
-	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
+	public static EvictingDualNodeHashTable HealthBarDefinition_cached;
 	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
-	public static EvictingDualNodeHashTable field1795;
+	@Export("HealthBarDefinition_cachedSprites")
+	public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites;
 	@ObfuscatedName("t")
 	@ObfuscatedGetter(
 		intValue = 80054529
@@ -83,8 +84,8 @@ public class HealthBarDefinition extends DualNode {
 	public int widthPadding;
 
 	static {
+		HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
 		HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
-		field1795 = new EvictingDualNodeHashTable(64);
 	}
 
 	HealthBarDefinition() {
@@ -154,17 +155,18 @@ public class HealthBarDefinition extends DualNode {
 		descriptor = "(I)Lpl;",
 		garbageValue = "-1857525750"
 	)
-	public SpritePixels method3239() {
+	@Export("getFrontSprite")
+	public SpritePixels getFrontSprite() {
 		if (this.frontSpriteID < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)field1795.get((long)this.frontSpriteID);
+			SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID);
 			if (var1 != null) {
 				return var1;
 			} else {
 				var1 = class6.SpriteBuffer_getSprite(field1802, this.frontSpriteID, 0);
 				if (var1 != null) {
-					field1795.put(var1, (long)this.frontSpriteID);
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID);
 				}
 
 				return var1;
@@ -177,18 +179,18 @@ public class HealthBarDefinition extends DualNode {
 		descriptor = "(I)Lpl;",
 		garbageValue = "-1451649947"
 	)
-	@Export("getFrontSprite")
+	@Export("getBackSprite")
-	public SpritePixels getFrontSprite() {
+	public SpritePixels getBackSprite() {
 		if (this.backSpriteID < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)field1795.get((long)this.backSpriteID);
+			SpritePixels var1 = (SpritePixels) HealthBarDefinition_cachedSprites.get((long)this.backSpriteID);
 			if (var1 != null) {
 				return var1;
 			} else {
 				var1 = class6.SpriteBuffer_getSprite(field1802, this.backSpriteID, 0);
 				if (var1 != null) {
-					field1795.put(var1, (long)this.backSpriteID);
+					HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID);
 				}
 
 				return var1;

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

@@ -28,20 +28,20 @@ public class HitSplatDefinition extends DualNode {
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
+	@Export("HitSplatDefinition_cached")
+	static EvictingDualNodeHashTable HitSplatDefinition_cached;
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "Liq;"
+	)
 	@Export("HitSplatDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("t")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("s")
-	@ObfuscatedSignature(
-		descriptor = "Liq;"
-	)
-	@Export("HealthBarDefinition_cached")
-	static EvictingDualNodeHashTable HealthBarDefinition_cached;
 	@ObfuscatedName("oe")
 	@ObfuscatedGetter(
 		intValue = 1196014399
@@ -128,9 +128,9 @@ public class HitSplatDefinition extends DualNode {
 	int transformVarp;
 
 	static {
+		HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
 		HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
-		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(64);
+		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
-		HealthBarDefinition_cached = new EvictingDualNodeHashTable(20);
 	}
 
 	HitSplatDefinition() {
@@ -289,13 +289,13 @@ public class HitSplatDefinition extends DualNode {
 		if (this.field1935 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1935);
+			SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1935);
 			if (var1 != null) {
 				return var1;
 			} else {
 				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1935, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1935);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1935);
 				}
 
 				return var1;
@@ -312,13 +312,13 @@ public class HitSplatDefinition extends DualNode {
 		if (this.field1936 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1936);
+			SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1936);
 			if (var1 != null) {
 				return var1;
 			} else {
 				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1936, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1936);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1936);
 				}
 
 				return var1;
@@ -335,13 +335,13 @@ public class HitSplatDefinition extends DualNode {
 		if (this.field1937 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1937);
+			SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1937);
 			if (var1 != null) {
 				return var1;
 			} else {
 				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1937, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1937);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1937);
 				}
 
 				return var1;
@@ -358,13 +358,13 @@ public class HitSplatDefinition extends DualNode {
 		if (this.field1938 < 0) {
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedFonts.get((long)this.field1938);
+			SpritePixels var1 = (SpritePixels) HitSplatDefinition_cachedSprites.get((long)this.field1938);
 			if (var1 != null) {
 				return var1;
 			} else {
 				var1 = class6.SpriteBuffer_getSprite(field1939, this.field1938, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedFonts.put(var1, (long)this.field1938);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field1938);
 				}
 
 				return var1;
@@ -382,7 +382,7 @@ public class HitSplatDefinition extends DualNode {
 		if (this.fontId == -1) {
 			return null;
 		} else {
-			Font var1 = (Font)HealthBarDefinition_cached.get((long)this.fontId);
+			Font var1 = (Font) HitSplatDefinition_cachedFonts.get((long)this.fontId);
 			if (var1 != null) {
 				return var1;
 			} else {
@@ -407,7 +407,7 @@ public class HitSplatDefinition extends DualNode {
 				}
 
 				if (var2 != null) {
-					HealthBarDefinition_cached.put(var2, (long)this.fontId);
+					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
 				}
 
 				return var2;

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

@@ -124,7 +124,7 @@ public final class ItemLayer {
 						var0.orientation = 0;
 					}
 
-					class185 var6 = var0.field1153[var0.pathLength - 1];
+					class185 var6 = var0.pathTraversed[var0.pathLength - 1];
 					if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
 						int var7 = var0.orientation - var0.rotation & 2047;
 						if (var7 > 1024) {

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

@@ -52,13 +52,13 @@ public class JagexCache {
 		garbageValue = "2123818799"
 	)
 	static class120 method3064(int var0) {
-		class120 var1 = (class120)SequenceDefinition.field2086.get((long)var0);
+		class120 var1 = (class120)SequenceDefinition.SequenceDefinition_cachedModel.get((long)var0);
 		if (var1 != null) {
 			return var1;
 		} else {
 			var1 = class112.method2571(SequenceDefinition.SequenceDefinition_animationsArchive, class118.SequenceDefinition_skeletonsArchive, var0, false);
 			if (var1 != null) {
-				SequenceDefinition.field2086.put(var1, (long)var0);
+				SequenceDefinition.SequenceDefinition_cachedModel.put(var1, (long)var0);
 			}
 
 			return var1;

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

@@ -91,7 +91,8 @@ public final class KeyHandler implements KeyListener, FocusListener {
 	@ObfuscatedSignature(
 		descriptor = "Lkz;"
 	)
-	static Archive field151;
+	@Export("archive4")
+	static Archive archive4;
 
 	static {
 		KeyHandler_instance = new KeyHandler();

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

@@ -5,8 +5,6 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@lz
-@jc
 @ObfuscatedName("lf")
 @Implements("Language")
 public class Language implements MouseWheel {

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

@@ -89,11 +89,14 @@ public class Model extends Renderable {
 	@ObfuscatedName("bb")
 	static boolean field2492;
 	@ObfuscatedName("bt")
-	static int[] field2465;
+	@Export("Model_sine")
+	static int[] Model_sine;
 	@ObfuscatedName("bh")
-	static int[] field2489;
+	@Export("Model_cosine")
+	static int[] Model_cosine;
 	@ObfuscatedName("bn")
-	static int[] field2490;
+	@Export("Model_colorPalette")
+	static int[] Model_colorPalette;
 	@ObfuscatedName("bj")
 	static int[] field2491;
 	@ObfuscatedName("w")
@@ -232,9 +235,9 @@ public class Model extends Renderable {
 		field2480 = new int[10];
 		field2453 = new int[10];
 		field2492 = true;
-		field2465 = Rasterizer3D.Rasterizer3D_sine;
+		Model_sine = Rasterizer3D.Rasterizer3D_sine;
-		field2489 = Rasterizer3D.Rasterizer3D_cosine;
+		Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
-		field2490 = Rasterizer3D.Rasterizer3D_colorPalette;
+		Model_colorPalette = Rasterizer3D.Rasterizer3D_colorPalette;
 		field2491 = Rasterizer3D.field2271;
 	}
 
@@ -585,8 +588,8 @@ public class Model extends Renderable {
 			int var5 = 0;
 			int var6 = 0;
 			int var7 = 0;
-			int var8 = field2489[var1];
+			int var8 = Model_cosine[var1];
-			int var9 = field2465[var1];
+			int var9 = Model_sine[var1];
 
 			for (int var10 = 0; var10 < this.verticesCount; ++var10) {
 				int var11 = Rasterizer3D.method3847(this.verticesX[var10], this.verticesZ[var10], var8, var9);
@@ -983,24 +986,24 @@ public class Model extends Renderable {
 							int var16;
 							int var17;
 							if (var14 != 0) {
-								var15 = field2465[var14];
+								var15 = Model_sine[var14];
-								var16 = field2489[var14];
+								var16 = Model_cosine[var14];
 								var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
 								this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
 								this.verticesX[var11] = var17;
 							}
 
 							if (var12 != 0) {
-								var15 = field2465[var12];
+								var15 = Model_sine[var12];
-								var16 = field2489[var12];
+								var16 = Model_cosine[var12];
 								var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
 								this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
 								this.verticesY[var11] = var17;
 							}
 
 							if (var13 != 0) {
-								var15 = field2465[var13];
+								var15 = Model_sine[var13];
-								var16 = field2489[var13];
+								var16 = Model_cosine[var13];
 								var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
 								this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
 								this.verticesX[var11] = var17;
@@ -1082,7 +1085,8 @@ public class Model extends Renderable {
 	}
 
 	@ObfuscatedName("z")
-	public void method4206() {
+	@Export("rotateY180")
+	public void rotateY180() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) {
 			this.verticesX[var1] = -this.verticesX[var1];
 			this.verticesZ[var1] = -this.verticesZ[var1];
@@ -1092,7 +1096,8 @@ public class Model extends Renderable {
 	}
 
 	@ObfuscatedName("i")
-	public void method4190() {
+	@Export("rotateY270Ccw")
+	public void rotateY270Ccw() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) {
 			int var2 = this.verticesZ[var1];
 			this.verticesZ[var1] = this.verticesX[var1];
@@ -1105,8 +1110,8 @@ public class Model extends Renderable {
 	@ObfuscatedName("y")
 	@Export("rotateZ")
 	public void rotateZ(int var1) {
-		int var2 = field2465[var1];
+		int var2 = Model_sine[var1];
-		int var3 = field2489[var1];
+		int var3 = Model_cosine[var1];
 
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) {
 			int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16;
@@ -1153,14 +1158,14 @@ public class Model extends Renderable {
 
 		int var8 = Rasterizer3D.Rasterizer3D_clipMidX;
 		int var9 = Rasterizer3D.Rasterizer3D_clipMidY;
-		int var10 = field2465[var1];
+		int var10 = Model_sine[var1];
-		int var11 = field2489[var1];
+		int var11 = Model_cosine[var1];
-		int var12 = field2465[var2];
+		int var12 = Model_sine[var2];
-		int var13 = field2489[var2];
+		int var13 = Model_cosine[var2];
-		int var14 = field2465[var3];
+		int var14 = Model_sine[var3];
-		int var15 = field2489[var3];
+		int var15 = Model_cosine[var3];
-		int var16 = field2465[var4];
+		int var16 = Model_sine[var4];
-		int var17 = field2489[var4];
+		int var17 = Model_cosine[var4];
 		int var18 = var16 * var6 + var17 * var7 >> 16;
 
 		for (int var19 = 0; var19 < this.verticesCount; ++var19) {
@@ -1217,14 +1222,14 @@ public class Model extends Renderable {
 
 		int var9 = Rasterizer3D.Rasterizer3D_clipMidX;
 		int var10 = Rasterizer3D.Rasterizer3D_clipMidY;
-		int var11 = field2465[var1];
+		int var11 = Model_sine[var1];
-		int var12 = field2489[var1];
+		int var12 = Model_cosine[var1];
-		int var13 = field2465[var2];
+		int var13 = Model_sine[var2];
-		int var14 = field2489[var2];
+		int var14 = Model_cosine[var2];
-		int var15 = field2465[var3];
+		int var15 = Model_sine[var3];
-		int var16 = field2489[var3];
+		int var16 = Model_cosine[var3];
-		int var17 = field2465[var4];
+		int var17 = Model_sine[var4];
-		int var18 = field2489[var4];
+		int var18 = Model_cosine[var4];
 		int var19 = var17 * var6 + var18 * var7 >> 16;
 
 		for (int var20 = 0; var20 < this.verticesCount; ++var20) {
@@ -1563,7 +1568,7 @@ public class Model extends Renderable {
 					Rasterizer3D.method3876(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field2468[var5], field2468[var6], field2468[var7], field2469[var5], field2469[var6], field2469[var7], field2470[var5], field2470[var6], field2470[var7], this.faceTextures[var1]);
 				}
 			} else if (this.faceColors3[var1] == -1) {
-				Rasterizer3D.method3856(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field2490[this.faceColors1[var1]]);
+				Rasterizer3D.method3856(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], Model_colorPalette[this.faceColors1[var1]]);
 			} else if (this.field2474 > 0) {
 				var5 = this.method4216(this.faceColors1[var1], this.field2494, this.field2495, this.field2479, this.field2474);
 				var6 = this.method4216(this.faceColors2[var1], this.field2494, this.field2495, this.field2479, this.field2474);
@@ -1700,7 +1705,7 @@ public class Model extends Renderable {
 					Rasterizer3D.method3876(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], this.faceTextures[var1]);
 				}
 			} else if (this.faceColors3[var1] == -1) {
-				Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, field2490[this.faceColors1[var1]]);
+				Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, Model_colorPalette[this.faceColors1[var1]]);
 			} else {
 				Rasterizer3D.method3854(var14, var15, var16, var11, var12, var13, field2453[0], field2453[1], field2453[2]);
 			}
@@ -1732,7 +1737,7 @@ public class Model extends Renderable {
 					Rasterizer3D.method3876(var14, var16, field2480[3], var11, var13, field2467[3], field2453[0], field2453[2], field2453[3], field2468[var17], field2468[var18], field2468[var19], field2469[var17], field2469[var18], field2469[var19], field2470[var17], field2470[var18], field2470[var19], var21);
 				}
 			} else if (this.faceColors3[var1] == -1) {
-				var17 = field2490[this.faceColors1[var1]];
+				var17 = Model_colorPalette[this.faceColors1[var1]];
 				Rasterizer3D.method3856(var14, var15, var16, var11, var12, var13, var17);
 				Rasterizer3D.method3856(var14, var16, field2480[3], var11, var13, field2467[3], var17);
 			} else {
@@ -1969,8 +1974,8 @@ public class Model extends Renderable {
 							var48 = 0;
 							var37 = 0;
 							if (var1 != 0) {
-								var48 = field2465[var1];
+								var48 = Model_sine[var1];
-								var37 = field2489[var1];
+								var37 = Model_cosine[var1];
 							}
 
 							for (var38 = 0; var38 < this.verticesCount; ++var38) {

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

@@ -89,12 +89,12 @@ public final class NPC extends Actor {
 		for (int var5 = super.pathLength; var5 > 0; --var5) {
 			super.pathX[var5] = super.pathX[var5 - 1];
 			super.pathY[var5] = super.pathY[var5 - 1];
-			super.field1153[var5] = super.field1153[var5 - 1];
+			super.pathTraversed[var5] = super.pathTraversed[var5 - 1];
 		}
 
 		super.pathX[0] = var3;
 		super.pathY[0] = var4;
-		super.field1153[0] = var2;
+		super.pathTraversed[0] = var2;
 	}
 
 	@ObfuscatedName("b")
@@ -163,12 +163,12 @@ public final class NPC extends Actor {
 				for (int var6 = super.pathLength; var6 > 0; --var6) {
 					super.pathX[var6] = super.pathX[var6 - 1];
 					super.pathY[var6] = super.pathY[var6 - 1];
-					super.field1153[var6] = super.field1153[var6 - 1];
+					super.pathTraversed[var6] = super.pathTraversed[var6 - 1];
 				}
 
 				super.pathX[0] = var1;
 				super.pathY[0] = var2;
-				super.field1153[0] = class185.field2123;
+				super.pathTraversed[0] = class185.field2123;
 				return;
 			}
 		}

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

@@ -262,8 +262,8 @@ public final class ObjectSound extends Node {
 		garbageValue = "30466"
 	)
 	public static void method1796() {
+		HitSplatDefinition.HitSplatDefinition_cached.clear();
 		HitSplatDefinition.HitSplatDefinition_cachedSprites.clear();
 		HitSplatDefinition.HitSplatDefinition_cachedFonts.clear();
-		HitSplatDefinition.HealthBarDefinition_cached.clear();
 	}
 }

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

@@ -569,12 +569,12 @@ public final class Player extends Actor {
 		for (int var4 = super.pathLength; var4 > 0; --var4) {
 			super.pathX[var4] = super.pathX[var4 - 1];
 			super.pathY[var4] = super.pathY[var4 - 1];
-			super.field1153[var4] = super.field1153[var4 - 1];
+			super.pathTraversed[var4] = super.pathTraversed[var4 - 1];
 		}
 
 		super.pathX[0] = var1;
 		super.pathY[0] = var2;
-		super.field1153[0] = var3;
+		super.pathTraversed[0] = var3;
 	}
 
 	@ObfuscatedName("f")

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

@@ -24,8 +24,8 @@ public class PlayerComposition {
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
-	@Export("Widget_cachedSprites")
+	@Export("PlayerAppearance_cachedModels")
-	public static EvictingDualNodeHashTable Widget_cachedSprites;
+	public static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
 	@ObfuscatedName("hi")
 	@ObfuscatedSignature(
 		descriptor = "[Lpl;"
@@ -68,7 +68,7 @@ public class PlayerComposition {
 
 	static {
 		equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10};
-		Widget_cachedSprites = new EvictingDualNodeHashTable(260);
+		PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
 	}
 
 	public PlayerComposition() {
@@ -266,7 +266,7 @@ public class PlayerComposition {
 		this.equipment[5] = var3;
 		this.equipment[9] = var4;
 		if (var1 != 0L && var1 != this.hash || this.field3200) {
-			Widget_cachedSprites.remove(var1);
+			PlayerAppearance_cachedModels.remove(var1);
 		}
 
 	}
@@ -301,7 +301,7 @@ public class PlayerComposition {
 				}
 			}
 
-			Model var18 = (Model)Widget_cachedSprites.get(var5);
+			Model var18 = (Model) PlayerAppearance_cachedModels.get(var5);
 			if (var18 == null) {
 				boolean var9 = false;
 
@@ -319,7 +319,7 @@ public class PlayerComposition {
 
 				if (var9) {
 					if (this.field3201 != -1L) {
-						var18 = (Model)Widget_cachedSprites.get(this.field3201);
+						var18 = (Model) PlayerAppearance_cachedModels.get(this.field3201);
 					}
 
 					if (var18 == null) {
@@ -381,7 +381,7 @@ public class PlayerComposition {
 					}
 
 					var18 = var20.toModel(64, 850, -30, -50, -30);
-					Widget_cachedSprites.put(var18, var5);
+					PlayerAppearance_cachedModels.put(var18, var5);
 					this.field3201 = var5;
 				}
 			}

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

@@ -135,12 +135,13 @@ public final class Projectile extends Renderable {
 	@ObfuscatedGetter(
 		intValue = -43602097
 	)
-	int field904;
+	@Export("frameCycle")
+	int frameCycle;
 
 	Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) {
 		this.isMoving = false;
 		this.frame = 0;
-		this.field904 = 0;
+		this.frameCycle = 0;
 		this.id = var1;
 		this.plane = var2;
 		this.sourceX = var3;
@@ -223,16 +224,16 @@ public final class Projectile extends Renderable {
 		this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047;
 		if (this.sequenceDefinition != null) {
 			if (!this.sequenceDefinition.method3690()) {
-				this.field904 += var1;
+				this.frameCycle += var1;
 
 				while (true) {
 					do {
 						do {
-							if (this.field904 <= this.sequenceDefinition.frameLengths[this.frame]) {
+							if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) {
 								return;
 							}
 
-							this.field904 -= this.sequenceDefinition.frameLengths[this.frame];
+							this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame];
 							++this.frame;
 						} while(this.frame < this.sequenceDefinition.frameIds.length);
 

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

@@ -607,10 +607,10 @@ public class Rasterizer2D extends DualNode {
 	@ObfuscatedName("dc")
 	@Export("Rasterizer2D_drawRectangle")
 	public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
-		method7649(var0, var1, var2, var4);
+		Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4);
-		method7649(var0, var3 + var1 - 1, var2, var4);
+		Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4);
-		method7709(var0, var1, var3, var4);
+		Rasterizer2D_drawVerticalLine(var0, var1, var3, var4);
-		method7709(var0 + var2 - 1, var1, var3, var4);
+		Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4);
 	}
 
 	@ObfuscatedName("dq")
@@ -626,7 +626,8 @@ public class Rasterizer2D extends DualNode {
 	}
 
 	@ObfuscatedName("db")
-	public static void method7649(int var0, int var1, int var2, int var3) {
+	@Export("Rasterizer2D_drawHorizontalLine")
+	public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
 		if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
 			if (var0 < Rasterizer2D_xClipStart) {
 				var2 -= Rasterizer2D_xClipStart - var0;
@@ -677,7 +678,8 @@ public class Rasterizer2D extends DualNode {
 	}
 
 	@ObfuscatedName("dd")
-	public static void method7709(int var0, int var1, int var2, int var3) {
+	@Export("Rasterizer2D_drawVerticalLine")
+	public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
 		if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
 			if (var1 < Rasterizer2D_yClipStart) {
 				var2 -= Rasterizer2D_yClipStart - var1;
@@ -735,16 +737,16 @@ public class Rasterizer2D extends DualNode {
 		var3 -= var1;
 		if (var3 == 0) {
 			if (var2 >= 0) {
-				method7649(var0, var1, var2 + 1, var4);
+				Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4);
 			} else {
-				method7649(var0 + var2, var1, -var2 + 1, var4);
+				Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4);
 			}
 
 		} else if (var2 == 0) {
 			if (var3 >= 0) {
-				method7709(var0, var1, var3 + 1, var4);
+				Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4);
 			} else {
-				method7709(var0, var3 + var1, -var3 + 1, var4);
+				Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4);
 			}
 
 		} else {

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

@@ -26,12 +26,14 @@ public abstract class RouteStrategy {
 	@ObfuscatedGetter(
 		intValue = 1459181163
 	)
-	public int field2117;
+	@Export("approxDestinationSizeX")
+	public int approxDestinationSizeX;
 	@ObfuscatedName("m")
 	@ObfuscatedGetter(
 		intValue = 1902503467
 	)
-	public int field2114;
+	@Export("approxDestinationSizeY")
+	public int approxDestinationSizeY;
 
 	protected RouteStrategy() {
 	}

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

@@ -0,0 +1,70 @@
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class RuneLiteIterableHashTable implements Iterator
+{
+	public Node node;
+	public final NodeHashTable nodeHashTable;
+	public int it;
+
+	public RuneLiteIterableHashTable(NodeHashTable nodeHashTable)
+	{
+		this.nodeHashTable = nodeHashTable;
+	}
+
+	@Override
+	public boolean hasNext()
+	{
+		if (this.it > 0 && this.nodeHashTable.buckets[this.it - 1] != this.node)
+		{
+			return true;
+		}
+		else
+		{
+			for (int i = this.it; i < this.nodeHashTable.size; ++i)
+			{
+				Node bucket = this.nodeHashTable.buckets[i];
+				Node previous = bucket.previous;
+
+				if (bucket != previous)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+	}
+
+	@Override
+	public Node next()
+	{
+		if (this.it > 0 && this.nodeHashTable.buckets[this.it - 1] != this.node)
+		{
+			Node node = this.node;
+			this.node = node.previous;
+
+			return node;
+		}
+		else
+		{
+			Node node;
+			Node previous;
+
+			do
+			{
+				if (this.it >= this.nodeHashTable.size)
+				{
+					throw new NoSuchElementException();
+				}
+
+				node = this.nodeHashTable.buckets[this.it++];
+				previous = node.previous;
+			} while (node == previous);
+
+			this.node = previous.previous;
+
+			return previous;
+		}
+	}
+}

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

@@ -0,0 +1,45 @@
+public class RuneLiteObject extends GraphicsObject
+{
+	public Model model;
+	public boolean loop;
+
+	public RuneLiteObject() {
+		super.isFinished = true;
+	}
+
+	public boolean isLooping() {
+		return loop;
+	}
+
+	public boolean isActive() {
+		return !super.isFinished;
+	}
+
+	public void setActive(boolean active)
+	{
+		if (super.isFinished == active)
+		{
+			super.isFinished = !active;
+
+			if (active)
+			{
+				super.frame = 0;
+				super.frameCycle = 0;
+				Client.graphicsObjects.addFirst(this);
+			}
+			else
+			{
+				remove();
+			}
+
+		}
+	}
+
+	public void setShouldLoop(boolean var1) {
+		this.loop = var1;
+	}
+
+	public void setModel(Model var1) {
+		this.model = var1;
+	}
+}

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

@@ -34,7 +34,8 @@ public class SequenceDefinition extends DualNode {
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
-	public static EvictingDualNodeHashTable field2086;
+	@Export("SequenceDefinition_cachedModel")
+	public static EvictingDualNodeHashTable SequenceDefinition_cachedModel;
 	@ObfuscatedName("w")
 	@ObfuscatedGetter(
 		intValue = -2061102361
@@ -118,7 +119,7 @@ public class SequenceDefinition extends DualNode {
 		field2084 = false;
 		SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
 		SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100);
-		field2086 = new EvictingDualNodeHashTable(100);
+		SequenceDefinition_cachedModel = new EvictingDualNodeHashTable(100);
 	}
 
 	SequenceDefinition() {
@@ -328,9 +329,9 @@ public class SequenceDefinition extends DualNode {
 				var5 = var1.toSharedSequenceModel(!var6.hasAlphaTransform(var2));
 				var3 &= 3;
 				if (var3 == 1) {
-					var5.method4190();
+					var5.rotateY270Ccw();
 				} else if (var3 == 2) {
-					var5.method4206();
+					var5.rotateY180();
 				} else if (var3 == 3) {
 					var5.rotateY90Ccw();
 				}
@@ -339,9 +340,9 @@ public class SequenceDefinition extends DualNode {
 				if (var3 == 1) {
 					var5.rotateY90Ccw();
 				} else if (var3 == 2) {
-					var5.method4206();
+					var5.rotateY180();
 				} else if (var3 == 3) {
-					var5.method4190();
+					var5.rotateY270Ccw();
 				}
 
 				return var5;
@@ -354,9 +355,9 @@ public class SequenceDefinition extends DualNode {
 				var5 = var1.toSharedSequenceModel(!var4.method2695());
 				var3 &= 3;
 				if (var3 == 1) {
-					var5.method4190();
+					var5.rotateY270Ccw();
 				} else if (var3 == 2) {
-					var5.method4206();
+					var5.rotateY180();
 				} else if (var3 == 3) {
 					var5.rotateY90Ccw();
 				}
@@ -365,9 +366,9 @@ public class SequenceDefinition extends DualNode {
 				if (var3 == 1) {
 					var5.rotateY90Ccw();
 				} else if (var3 == 2) {
-					var5.method4206();
+					var5.rotateY180();
 				} else if (var3 == 3) {
-					var5.method4190();
+					var5.rotateY270Ccw();
 				}
 
 				return var5;

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

@@ -64,26 +64,26 @@ public class UrlRequest {
 		ItemComposition.ItemDefinition_cachedSprites.clear();
 		SequenceDefinition.SequenceDefinition_cached.clear();
 		SequenceDefinition.SequenceDefinition_cachedFrames.clear();
-		SequenceDefinition.field2086.clear();
+		SequenceDefinition.SequenceDefinition_cachedModel.clear();
 		InterfaceParent.method2143();
 		class1.method8();
 		VarpDefinition.VarpDefinition_cached.clear();
 		AbstractSocket.HitSplatDefinition_cachedSprites.method7216();
 		Ignored.HitSplatDefinition_cached.method7216();
 		ObjectSound.method1796();
+		HealthBarDefinition.HealthBarDefinition_cached.clear();
 		HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
-		HealthBarDefinition.field1795.clear();
 		ObjectComposition.method3542();
 		ParamComposition.ParamDefinition_cached.clear();
-		WorldMapElement.PlayerAppearance_cachedModels.clear();
+		WorldMapElement.WorldMapElement_cachedSprites.clear();
-		PlayerComposition.Widget_cachedSprites.clear();
+		PlayerComposition.PlayerAppearance_cachedModels.clear();
 		WorldMapSection2.method4417();
 		((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear();
 		Script.Script_cached.clear();
-		class115.archive1.clearFiles();
+		class115.archive0.clearFiles();
-		class9.archive3.clearFiles();
+		class9.archive1.clearFiles();
-		class19.archive4.clearFiles();
+		class19.archive3.clearFiles();
-		KeyHandler.field151.clearFiles();
+		KeyHandler.archive4.clearFiles();
 		class140.archive5.clearFiles();
 		WorldMapScaleHandler.archive6.clearFiles();
 		class115.archive7.clearFiles();

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

@@ -68,11 +68,11 @@ public class UserComparator10 extends AbstractUserComparator {
 			Login.Login_loadingPercent = 10;
 			Client.titleLoadingStage = 30;
 		} else if (Client.titleLoadingStage == 30) {
-			class115.archive1 = VarcInt.newArchive(0, false, true, true);
+			class115.archive0 = VarcInt.newArchive(0, false, true, true);
-			class9.archive3 = VarcInt.newArchive(1, false, true, true);
+			class9.archive1 = VarcInt.newArchive(1, false, true, true);
 			class131.archive2 = VarcInt.newArchive(2, true, false, true);
-			class19.archive4 = VarcInt.newArchive(3, false, true, true);
+			class19.archive3 = VarcInt.newArchive(3, false, true, true);
-			KeyHandler.field151 = VarcInt.newArchive(4, false, true, true);
+			KeyHandler.archive4 = VarcInt.newArchive(4, false, true, true);
 			class140.archive5 = VarcInt.newArchive(5, true, true, true);
 			WorldMapScaleHandler.archive6 = VarcInt.newArchive(6, true, true, true);
 			class115.archive7 = VarcInt.newArchive(7, false, true, true);
@@ -93,11 +93,11 @@ public class UserComparator10 extends AbstractUserComparator {
 			Client.titleLoadingStage = 40;
 		} else if (Client.titleLoadingStage == 40) {
 			byte var41 = 0;
-			var18 = var41 + class115.archive1.percentage() * 4 / 100;
+			var18 = var41 + class115.archive0.percentage() * 4 / 100;
-			var18 += class9.archive3.percentage() * 4 / 100;
+			var18 += class9.archive1.percentage() * 4 / 100;
 			var18 += class131.archive2.percentage() * 2 / 100;
-			var18 += class19.archive4.percentage() * 2 / 100;
+			var18 += class19.archive3.percentage() * 2 / 100;
-			var18 += KeyHandler.field151.percentage() * 6 / 100;
+			var18 += KeyHandler.archive4.percentage() * 6 / 100;
 			var18 += class140.archive5.percentage() * 4 / 100;
 			var18 += WorldMapScaleHandler.archive6.percentage() * 2 / 100;
 			var18 += class115.archive7.percentage() * 56 / 100;
@@ -120,9 +120,9 @@ public class UserComparator10 extends AbstractUserComparator {
 
 				Login.Login_loadingPercent = 30;
 			} else {
-				NetFileRequest.method5587(class115.archive1, "Animations");
+				NetFileRequest.method5587(class115.archive0, "Animations");
-				NetFileRequest.method5587(class9.archive3, "Skeletons");
+				NetFileRequest.method5587(class9.archive1, "Skeletons");
-				NetFileRequest.method5587(KeyHandler.field151, "Sound FX");
+				NetFileRequest.method5587(KeyHandler.archive4, "Sound FX");
 				NetFileRequest.method5587(class140.archive5, "Maps");
 				NetFileRequest.method5587(WorldMapScaleHandler.archive6, "Music Tracks");
 				NetFileRequest.method5587(class115.archive7, "Models");
@@ -152,7 +152,7 @@ public class UserComparator10 extends AbstractUserComparator {
 				JagexCache.pcmPlayer0.setStream(var37);
 				var2 = class133.archive15;
 				Archive var39 = ChatChannel.archive14;
-				Archive var29 = KeyHandler.field151;
+				Archive var29 = KeyHandler.archive4;
 				class260.musicPatchesArchive = var2;
 				class331.musicSamplesArchive = var39;
 				class260.soundEffectsArchive = var29;
@@ -219,8 +219,8 @@ public class UserComparator10 extends AbstractUserComparator {
 						WorldMapLabelSize.ItemDefinition_fileCount = ItemComposition.ItemDefinition_archive.getGroupFileCount(10);
 						ItemComposition.ItemDefinition_fontPlain11 = var4;
 						Archive var34 = class131.archive2;
-						Archive var22 = class115.archive1;
+						Archive var22 = class115.archive0;
-						Archive var36 = class9.archive3;
+						Archive var36 = class9.archive1;
 						Canvas.SequenceDefinition_archive = var34;
 						SequenceDefinition.SequenceDefinition_animationsArchive = var22;
 						class118.SequenceDefinition_skeletonsArchive = var36;
@@ -230,7 +230,7 @@ public class UserComparator10 extends AbstractUserComparator {
 						Archive var38 = class131.archive2;
 						VarpDefinition.VarpDefinition_archive = var38;
 						class433.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16);
-						class194.method3937(class19.archive4, class115.archive7, UserComparator6.archive8, class1.archive13);
+						class194.method3937(class19.archive3, class115.archive7, UserComparator6.archive8, class1.archive13);
 						Archive var24 = class131.archive2;
 						InvDefinition.InvDefinition_archive = var24;
 						Archive var11 = class131.archive2;
@@ -670,8 +670,8 @@ public class UserComparator10 extends AbstractUserComparator {
 						Client.titleLoadingStage = 130;
 					}
 				} else if (Client.titleLoadingStage == 130) {
-					if (!class19.archive4.isFullyLoaded()) {
+					if (!class19.archive3.isFullyLoaded()) {
-						Login.Login_loadingText = "Loading interfaces - " + class19.archive4.loadPercent() * 4 / 5 + "%";
+						Login.Login_loadingText = "Loading interfaces - " + class19.archive3.loadPercent() * 4 / 5 + "%";
 						Login.Login_loadingPercent = 96;
 					} else if (!TaskHandler.archive12.isFullyLoaded()) {
 						Login.Login_loadingText = "Loading interfaces - " + (80 + TaskHandler.archive12.loadPercent() / 6) + "%";

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

@@ -115,7 +115,7 @@ public class UserComparator6 extends AbstractUserComparator {
 		garbageValue = "81"
 	)
 	public static HitSplatDefinition method2554(int var0) {
-		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cachedSprites.get((long)var0);
+		HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
 		} else {
@@ -125,7 +125,7 @@ public class UserComparator6 extends AbstractUserComparator {
 				var1.decode(new Buffer(var2));
 			}
 
-			HitSplatDefinition.HitSplatDefinition_cachedSprites.put(var1, (long)var0);
+			HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0);
 			return var1;
 		}
 	}

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

@@ -20,25 +20,26 @@ public class Widget extends Node {
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
+	@Export("Widget_cachedSprites")
+	static EvictingDualNodeHashTable Widget_cachedSprites;
+	@ObfuscatedName("h")
+	@ObfuscatedSignature(
+		descriptor = "Liq;"
+	)
 	@Export("Widget_cachedModels")
 	static EvictingDualNodeHashTable Widget_cachedModels;
-	@ObfuscatedName("h")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
 	@Export("Widget_cachedFonts")
 	static EvictingDualNodeHashTable Widget_cachedFonts;
-	@ObfuscatedName("g")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
 	@Export("Widget_cachedSpriteMasks")
 	static EvictingDualNodeHashTable Widget_cachedSpriteMasks;
-	@ObfuscatedName("e")
-	@ObfuscatedSignature(
-		descriptor = "Liq;"
-	)
-	static EvictingDualNodeHashTable field3222;
 	@ObfuscatedName("a")
 	public static boolean field3223;
 	@ObfuscatedName("u")
@@ -221,7 +222,7 @@ public class Widget extends Node {
 		descriptor = "Lpg;"
 	)
 	@Export("fillMode")
-	public class429 fillMode;
+	public FillMode fillMode;
 	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
 		intValue = 193150235
@@ -689,10 +690,10 @@ public class Widget extends Node {
 	public boolean prioritizeMenuEntry;
 
 	static {
-		Widget_cachedModels = new EvictingDualNodeHashTable(200);
+		Widget_cachedSprites = new EvictingDualNodeHashTable(200);
-		Widget_cachedFonts = new EvictingDualNodeHashTable(50);
+		Widget_cachedModels = new EvictingDualNodeHashTable(50);
-		Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(20);
+		Widget_cachedFonts = new EvictingDualNodeHashTable(20);
-		field3222 = new EvictingDualNodeHashTable(8);
+		Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8);
 		field3223 = false;
 	}
 
@@ -727,7 +728,7 @@ public class Widget extends Node {
 		this.mouseOverColor = 0;
 		this.mouseOverColor2 = 0;
 		this.fill = false;
-		this.fillMode = class429.SOLID;
+		this.fillMode = FillMode.SOLID;
 		this.transparencyTop = 0;
 		this.transparencyBot = 0;
 		this.lineWid = 1;
@@ -1274,7 +1275,7 @@ public class Widget extends Node {
 			return null;
 		} else {
 			long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39);
-			SpritePixels var5 = (SpritePixels)Widget_cachedModels.get(var3);
+			SpritePixels var5 = (SpritePixels) Widget_cachedSprites.get(var3);
 			if (var5 != null) {
 				return var5;
 			} else {
@@ -1307,7 +1308,7 @@ public class Widget extends Node {
 						var5.shadow(this.spriteShadow);
 					}
 
-					Widget_cachedModels.put(var5, var3);
+					Widget_cachedSprites.put(var5, var3);
 					return var5;
 				}
 			}
@@ -1325,7 +1326,7 @@ public class Widget extends Node {
 		if (this.fontId == -1) {
 			return null;
 		} else {
-			Font var1 = (Font)Widget_cachedSpriteMasks.get((long)this.fontId);
+			Font var1 = (Font) Widget_cachedFonts.get((long)this.fontId);
 			if (var1 != null) {
 				return var1;
 			} else {
@@ -1350,7 +1351,7 @@ public class Widget extends Node {
 				}
 
 				if (var2 != null) {
-					Widget_cachedSpriteMasks.put(var2, (long)this.fontId);
+					Widget_cachedFonts.put(var2, (long)this.fontId);
 				} else {
 					field3223 = true;
 				}
@@ -1373,13 +1374,13 @@ public class Widget extends Node {
 			if (var2 == -1) {
 				return null;
 			} else {
-				SpritePixels var3 = (SpritePixels)Widget_cachedModels.get((long)var2);
+				SpritePixels var3 = (SpritePixels) Widget_cachedSprites.get((long)var2);
 				if (var3 != null) {
 					return var3;
 				} else {
 					var3 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0);
 					if (var3 != null) {
-						Widget_cachedModels.put(var3, (long)var2);
+						Widget_cachedSprites.put(var3, (long)var2);
 					} else {
 						field3223 = true;
 					}
@@ -1415,7 +1416,7 @@ public class Widget extends Node {
 		} else if (var5 == 1 && var6 == -1) {
 			return null;
 		} else {
-			Model var7 = (Model)Widget_cachedFonts.get((long)(var6 + (var5 << 16)));
+			Model var7 = (Model) Widget_cachedModels.get((long)(var6 + (var5 << 16)));
 			if (var7 == null) {
 				ModelData var8;
 				if (var5 == 1) {
@@ -1463,7 +1464,7 @@ public class Widget extends Node {
 					var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50);
 				}
 
-				Widget_cachedFonts.put(var7, (long)(var6 + (var5 << 16)));
+				Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16)));
 			}
 
 			if (var1 != null) {
@@ -1490,7 +1491,7 @@ public class Widget extends Node {
 			return null;
 		} else {
 			long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39);
-			SpriteMask var5 = (SpriteMask)field3222.get(var3);
+			SpriteMask var5 = (SpriteMask) Widget_cachedSpriteMasks.get(var3);
 			if (var5 != null) {
 				return var5;
 			} else {
@@ -1526,7 +1527,7 @@ public class Widget extends Node {
 					}
 
 					var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2);
-					field3222.put(var5, var3);
+					Widget_cachedSpriteMasks.put(var5, var3);
 					return var5;
 				}
 			}

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

@@ -23,8 +23,8 @@ public class WorldMapElement extends DualNode {
 	@ObfuscatedSignature(
 		descriptor = "Liq;"
 	)
-	@Export("PlayerAppearance_cachedModels")
+	@Export("WorldMapElement_cachedSprites")
-	public static EvictingDualNodeHashTable PlayerAppearance_cachedModels;
+	public static EvictingDualNodeHashTable WorldMapElement_cachedSprites;
 	@ObfuscatedName("t")
 	@ObfuscatedGetter(
 		intValue = -2128430095
@@ -113,7 +113,7 @@ public class WorldMapElement extends DualNode {
 	public int category;
 
 	static {
-		PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(256);
+		WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
 	}
 
 	public WorldMapElement(int var1) {
@@ -284,13 +284,13 @@ public class WorldMapElement extends DualNode {
 		if (var1 < 0) {
 			return null;
 		} else {
-			SpritePixels var2 = (SpritePixels)PlayerAppearance_cachedModels.get((long)var1);
+			SpritePixels var2 = (SpritePixels) WorldMapElement_cachedSprites.get((long)var1);
 			if (var2 != null) {
 				return var2;
 			} else {
 				var2 = class6.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0);
 				if (var2 != null) {
-					PlayerAppearance_cachedModels.put(var2, (long)var1);
+					WorldMapElement_cachedSprites.put(var2, (long)var1);
 				}
 
 				return var2;

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

@@ -587,19 +587,19 @@ public class WorldMapRegion {
 
 						if (var8.decoration == WorldMapDecorationType.field3385.id) {
 							if (var8.rotation == 0) {
-								Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10);
 							}
 
 							if (var8.rotation == 1) {
-								Rasterizer2D.method7649(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10);
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10);
 							}
 
 							if (var8.rotation == 2) {
-								Rasterizer2D.method7649(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
 							}
 
 							if (var8.rotation == 3) {
-								Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
+								Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10);
 							}
 						}
 
@@ -608,11 +608,11 @@ public class WorldMapRegion {
 							int var12;
 							if (var11 == 0) {
 								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) {
-									Rasterizer2D.method7649(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10);
+									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10);
 								}
 							} else {
 								for (var12 = 0; var12 < this.pixelsPerTile; ++var12) {
-									Rasterizer2D.method7649(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10);
+									Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10);
 								}
 							}
 						}
@@ -895,19 +895,19 @@ public class WorldMapRegion {
 	void method4501(int var1, int var2, int var3, int var4) {
 		var3 %= 4;
 		if (var3 == 0) {
-			Rasterizer2D.method7709(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
+			Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
 		if (var3 == 1) {
-			Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
+			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
 		if (var3 == 2) {
-			Rasterizer2D.method7709(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
+			Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
 		}
 
 		if (var3 == 3) {
-			Rasterizer2D.method7649(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4);
+			Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4);
 		}
 
 	}

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

@@ -196,9 +196,9 @@ public class WorldMapSection2 implements WorldMapSection {
 		garbageValue = "12387"
 	)
 	public static void method4417() {
+		Widget.Widget_cachedSprites.clear();
 		Widget.Widget_cachedModels.clear();
 		Widget.Widget_cachedFonts.clear();
 		Widget.Widget_cachedSpriteMasks.clear();
-		Widget.field3222.clear();
 	}
 }

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

@@ -9,8 +9,8 @@ public class class115 {
 	@ObfuscatedSignature(
 		descriptor = "Lkz;"
 	)
-	@Export("archive1")
+	@Export("archive0")
-	static Archive archive1;
+	static Archive archive0;
 	@ObfuscatedName("ep")
 	@ObfuscatedSignature(
 		descriptor = "Lkz;"

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

@@ -39,7 +39,7 @@ public class class118 implements class110 {
 		garbageValue = "21"
 	)
 	public static HealthBarDefinition method2683(int var0) {
-		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cachedSprites.get((long)var0);
+		HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0);
 		if (var1 != null) {
 			return var1;
 		} else {
@@ -49,7 +49,7 @@ public class class118 implements class110 {
 				var1.decode(new Buffer(var2));
 			}
 
-			HealthBarDefinition.HealthBarDefinition_cachedSprites.put(var1, (long)var0);
+			HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0);
 			return var1;
 		}
 	}

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

@@ -133,13 +133,13 @@ public class class129 {
 
 		int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
 		Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field716);
-		Rasterizer2D.method7709(var0, var6 + var1 + 16, var5, Client.field544);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field544);
-		Rasterizer2D.method7709(var0 + 1, var6 + var1 + 16, var5, Client.field544);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field544);
-		Rasterizer2D.method7649(var0, var6 + var1 + 16, 16, Client.field544);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field544);
-		Rasterizer2D.method7649(var0, var6 + var1 + 17, 16, Client.field544);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field544);
-		Rasterizer2D.method7709(var0 + 15, var6 + var1 + 16, var5, Client.field509);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field509);
-		Rasterizer2D.method7709(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field509);
+		Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field509);
-		Rasterizer2D.method7649(var0, var6 + var5 + var1 + 15, 16, Client.field509);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field509);
-		Rasterizer2D.method7649(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field509);
+		Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field509);
 	}
 }

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

@@ -261,7 +261,7 @@ public class class143 {
 				return 1;
 			} else if (var0 == 1125) {
 				var8 = Interpreter.Interpreter_intStack[--IsaacCipher.Interpreter_intStackSize];
-				class429 var6 = (class429)class130.findEnumerated(class253.FillMode_values(), var8);
+				FillMode var6 = (FillMode)class130.findEnumerated(class253.FillMode_values(), var8);
 				if (var6 != null) {
 					var3.fillMode = var6;
 					SecureRandomCallable.invalidateWidget(var3);

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

@@ -223,8 +223,8 @@ public class class148 extends class126 {
 						}
 					} else {
 						HealthBarDefinition var96 = var88.definition;
-						SpritePixels var79 = var96.getFrontSprite();
+						SpritePixels var79 = var96.getBackSprite();
-						SpritePixels var81 = var96.method3239();
+						SpritePixels var81 = var96.getFrontSprite();
 						int var82 = 0;
 						if (var79 != null && var81 != null) {
 							if (var96.widthPadding * 2 < var81.subWidth) {

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

@@ -22,8 +22,8 @@ public class class19 {
 	@ObfuscatedSignature(
 		descriptor = "Lkz;"
 	)
-	@Export("archive4")
+	@Export("archive3")
-	static Archive archive4;
+	static Archive archive3;
 	@ObfuscatedName("fa")
 	@Export("secureRandom")
 	static SecureRandom secureRandom;

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

@@ -81,8 +81,8 @@ public class class253 {
 		garbageValue = "-850723008"
 	)
 	@Export("FillMode_values")
-	public static class429[] FillMode_values() {
+	public static FillMode[] FillMode_values() {
-		return new class429[]{class429.SOLID, class429.field4552, class429.field4553};
+		return new FillMode[]{FillMode.SOLID, FillMode.field4552, FillMode.field4553};
 	}
 
 	@ObfuscatedName("r")

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

@@ -1,7 +1,6 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
-@jc
 @ObfuscatedName("ly")
 public final class class330 {
 	@ObfuscatedName("j")

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

@@ -17,15 +17,15 @@ public class class363 {
 			var1 = UserComparator5.SequenceDefinition_get(var0.movementSequence);
 			if (var1 != null) {
 				if (!var1.method3690() && var1.frameIds != null) {
-					++var0.field1121;
+					++var0.movementFrameCycle;
-					if (var0.movementFrame < var1.frameIds.length && var0.field1121 > var1.frameLengths[var0.movementFrame]) {
+					if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
-						var0.field1121 = 1;
+						var0.movementFrameCycle = 1;
 						++var0.movementFrame;
 						class409.method7269(var1, var0.movementFrame, var0.x, var0.y);
 					}
 
 					if (var0.movementFrame >= var1.frameIds.length) {
-						var0.field1121 = 0;
+						var0.movementFrameCycle = 0;
 						var0.movementFrame = 0;
 						class409.method7269(var1, var0.movementFrame, var0.x, var0.y);
 					}
@@ -35,7 +35,7 @@ public class class363 {
 					if (var0.movementFrame < var2) {
 						Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y);
 					} else {
-						var0.field1121 = 0;
+						var0.movementFrameCycle = 0;
 						var0.movementFrame = 0;
 						Varcs.method2427(var1, var0.movementFrame, var0.x, var0.y);
 					}

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

@@ -34,8 +34,8 @@ public class class9 implements MouseWheel {
 	@ObfuscatedSignature(
 		descriptor = "Lkz;"
 	)
-	@Export("archive3")
+	@Export("archive1")
-	static Archive archive3;
+	static Archive archive1;
 	@ObfuscatedName("s")
 	@ObfuscatedGetter(
 		intValue = -171712909