Named both loading screen bar draws

Added notes on some of the interface draws (alpha boxes/container borders)

Client/src/main/java/org/runite/client/AbstractIndexedSprite.java

@@ -1,8 +1,8 @@
 package org.runite.client;
 
-abstract class AbstractIndexedSprite {
+public abstract class AbstractIndexedSprite {
 
-   int width;
+   public int width;
    int anInt1464;
    int anInt1467;
    int height;
@@ -12,6 +12,6 @@ abstract class AbstractIndexedSprite {
 
    abstract void method1666(int var1, int var2, int var3);
 
-   abstract void method1667(int var1, int var2);
+   public abstract void method1667(int var1, int var2);
 
 }

Client/src/main/java/org/runite/client/AbstractSprite.java

@@ -29,7 +29,7 @@ public abstract class AbstractSprite extends Node {
       }
    }
 
-   abstract void method639(int var1, int var2, int var3, int var4);
+   public abstract void method639(int var1, int var2, int var3, int var4);
 
    public final void drawScaledOrRotated(int x, int y, int angle, int scale) {
       try {

Client/src/main/java/org/runite/client/AudioHandler.java

@@ -31,7 +31,7 @@ public final class AudioHandler {
 
     static void soundEffectHandler(int soundEffectID, int soundEffectDelay, int soundEffectVolume) {
         try {
-          if(soundEffectVolume != 0 && soundEffectID != 0 && currentSoundEffectCount < 50 && soundEffectDelay != -1) {
+            if (soundEffectVolume != 0 && soundEffectID != 0 && currentSoundEffectCount < 50 && soundEffectDelay != -1) {
                 soundEffectVolumeArray[currentSoundEffectCount] = soundEffectID;
                 soundEffectIDs[currentSoundEffectCount] = soundEffectDelay;
                 anIntArray2157[currentSoundEffectCount] = soundEffectVolume;
@@ -47,12 +47,12 @@ public final class AudioHandler {
 
     static void method132() {
         try {
-          for(int var1 = 0; var1 < currentSoundEffectCount; ++var1) {
+            for (int var1 = 0; var1 < currentSoundEffectCount; ++var1) {
                 --anIntArray2157[var1];
-             if(anIntArray2157[var1] < -10) {
+                if (anIntArray2157[var1] < -10) {
                     --currentSoundEffectCount;
 
-                for(int var2 = var1; var2 < currentSoundEffectCount; ++var2) {
+                    for (int var2 = var1; var2 < currentSoundEffectCount; ++var2) {
                         soundEffectIDs[var2] = soundEffectIDs[var2 + 1];
                         soundEffects[var2] = soundEffects[var2 + 1];
                         soundEffectVolumeArray[var2] = soundEffectVolumeArray[1 + var2];
@@ -63,9 +63,9 @@ public final class AudioHandler {
                     --var1;
                 } else {
                     SynthSound var11 = soundEffects[var1];
-                if(null == var11) {
+                    if (null == var11) {
                         var11 = SynthSound.create(CacheIndex.soundFXIndex, soundEffectIDs[var1], 0);
-                   if(null == var11) {
+                        if (null == var11) {
                             continue;
                         }
 
@@ -73,38 +73,38 @@ public final class AudioHandler {
                         soundEffects[var1] = var11;
                     }
 
-                if(0 > anIntArray2157[var1]) {
+                    if (0 > anIntArray2157[var1]) {
                         int var3;
-                   if(soundEffectCoordinates[var1] == 0) {
+                        if (soundEffectCoordinates[var1] == 0) {
                             var3 = soundEffectVolume;
                         } else {
                             int var4 = (soundEffectCoordinates[var1] & 0xFF) * 128;
                             int var7 = soundEffectCoordinates[var1] >> 8 & 0xFF;
                             int var5 = soundEffectCoordinates[var1] >> 16 & 0xFF;
                             int var8 = -Class102.player.zAxis + 64 + 128 * var7;
-                      if(var8 < 0) {
+                            if (var8 < 0) {
                                 var8 = -var8;
                             }
 
                             int var6 = -Class102.player.xAxis + 64 + var5 * 128;
-                      if(0 > var6) {
+                            if (0 > var6) {
                                 var6 = -var6;
                             }
 
                             int var9 = -128 + var6 + var8;
-                      if(var9 > var4) {
+                            if (var9 > var4) {
                                 anIntArray2157[var1] = -100;
                                 continue;
                             }
 
-                      if(var9 < 0) {
+                            if (var9 < 0) {
                                 var9 = 0;
                             }
 
                             var3 = Sprites.ambientVolume * (var4 + -var9) / var4;
                         }
 
-                   if(var3 > 0) {
+                        if (var3 > 0) {
                             PcmSound var12 = var11.toPCMSound().method151(Class27.resampler);
                             Class3_Sub24_Sub1 var13 = Class3_Sub24_Sub1.method437(var12, var3);
                             Objects.requireNonNull(var13).method429(soundEffectVolumeArray[var1] - 1);
@@ -116,13 +116,13 @@ public final class AudioHandler {
                 }
             }
 
-          if(musicEffectPlaying && Class79.method1391(-1)) {
+            if (musicEffectPlaying && Class79.method1391(-1)) {
-             if(0 != musicVolume && currentTrack != -1) {
+                if (0 != musicVolume && currentTrack != -1) {
                     Class70.method1285(CacheIndex.musicIndex, currentTrack, musicVolume);
                 }
 
                 musicEffectPlaying = false;
-          } else if(musicVolume != 0 && currentTrack != -1 && Class79.method1391((byte) -92 + 91)) {
+            } else if (musicVolume != 0 && currentTrack != -1 && Class79.method1391((byte) -92 + 91)) {
                 TextureOperation12.outgoingBuffer.putOpcode(137);
                 TextureOperation12.outgoingBuffer.writeInt(currentTrack);
                 currentTrack = -1;

Client/src/main/java/org/runite/client/CS2Methods.java

@@ -37,4 +37,15 @@ public class CS2Methods {
             throw ClientErrorException.clientError(var4, "bd.C(" + (byte) 114 + ',' + var1 + ')');
         }
     }
+
+    static void method532(int var0) {
+        try {
+            Class3_Sub25 var2 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var0);
+            if (null != var2) {
+                var2.unlink();
+            }
+        } catch (RuntimeException var3) {
+            throw ClientErrorException.clientError(var3, "bc.A(" + var0 + ',' + -28236 + ')');
+        }
+    }
 }

Client/src/main/java/org/runite/client/Class1.java

@@ -63,7 +63,7 @@ final class Class1 {
                     var15 = var9[var13][var14] & 0xFF;
                     var16 = 255 & var10[var13][var14];
                     if (var16 != 0) {
-                        Class168 var17 = TextureOperation10.method350((byte) -81, -1 + var16);
+                        Class168 var17 = Class168.method350(-1 + var16);
                         if (var17.anInt2103 == -1) {
                             continue;
                         }
@@ -97,7 +97,7 @@ final class Class1 {
                         int var34;
                         byte var32;
                         if (var27 != 0 || var27 != var16) {
-                            var31 = TextureOperation10.method350((byte) 106, -1 + var27);
+                            var31 = Class168.method350(-1 + var27);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var32 = var5[var13 + -1][var14 - -1];
                                 var33 = var8[-1 + var13][var14 + 1];
@@ -119,7 +119,7 @@ final class Class1 {
                         }
 
                         if (var28 != 0 || var28 != var16) {
-                            var31 = TextureOperation10.method350((byte) 114, -1 + var28);
+                            var31 = Class168.method350(-1 + var28);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var32 = var5[-1 + var13][var14 + -1];
                                 var33 = var8[-1 + var13][-1 + var14];
@@ -141,7 +141,7 @@ final class Class1 {
                         }
 
                         if (var29 != 0 || var29 != var16) {
-                            var31 = TextureOperation10.method350((byte) 107, var29 - 1);
+                            var31 = Class168.method350(var29 - 1);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var32 = var5[1 + var13][var14 - 1];
                                 var33 = var8[var13 - -1][var14 + -1];
@@ -163,7 +163,7 @@ final class Class1 {
                         }
 
                         if (var30 != 0 || var30 != var16) {
-                            var31 = TextureOperation10.method350((byte) 105, var30 + -1);
+                            var31 = Class168.method350(var30 + -1);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var32 = var5[var13 - -1][1 + var14];
                                 var33 = var8[var13 + 1][1 + var14];
@@ -185,7 +185,7 @@ final class Class1 {
                         }
 
                         if (var23 != 0 && var23 != var16) {
-                            var31 = TextureOperation10.method350((byte) -29, -1 + var23);
+                            var31 = Class168.method350(-1 + var23);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var60 = anIntArray2642[4 * var8[var13][var14 - -1] + (var5[var13][var14 - -1] - -2 & 3)];
 
@@ -203,7 +203,7 @@ final class Class1 {
                         }
 
                         if (0 != var24 && var24 != var16) {
-                            var31 = TextureOperation10.method350((byte) -32, var24 + -1);
+                            var31 = Class168.method350(var24 + -1);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var65 = anIntArray2642[(3 & 3 + var5[var13 + -1][var14]) + var8[var13 + -1][var14] * 4];
 
@@ -221,7 +221,7 @@ final class Class1 {
                         }
 
                         if (var25 != 0 && var16 != var25) {
-                            var31 = TextureOperation10.method350((byte) 112, -1 + var25);
+                            var31 = Class168.method350(-1 + var25);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var21 = anIntArray2642[(3 & var5[var13][var14 + -1]) + var8[var13][var14 + -1] * 4];
 
@@ -239,7 +239,7 @@ final class Class1 {
                         }
 
                         if (0 != var26 && var16 != var26) {
-                            var31 = TextureOperation10.method350((byte) -41, var26 - 1);
+                            var31 = Class168.method350(var26 - 1);
                             if (var31.aBoolean2092 && var31.anInt2103 != -1) {
                                 var22 = anIntArray2642[(3 & var5[var13 + 1][var14] + 1) + 4 * var8[1 + var13][var14]];
 
@@ -262,7 +262,7 @@ final class Class1 {
                             var75 = TextureOperation8.aBooleanArrayArray3468[var25 != var74 ? 0 : var21];
                             boolean[] var80 = TextureOperation8.aBooleanArrayArray3468[var23 == var74 ? var60 : 0];
                             var81 = TextureOperation8.aBooleanArrayArray3468[var26 == var74 ? var22 : 0];
-                            Class168 var37 = TextureOperation10.method350((byte) 113, -1 + var74);
+                            Class168 var37 = Class168.method350(-1 + var74);
                             Class3_Sub11 var38 = method2052(var12, var37);
                             var38.anInt2342 += 5;
                             var38.anInt2342 += -2 + var80.length;
@@ -293,7 +293,7 @@ final class Class1 {
                     }
 
                     if (0 != var58) {
-                        Class168 var62 = TextureOperation10.method350((byte) -25, -1 + var58);
+                        Class168 var62 = Class168.method350(-1 + var58);
                         if (var62.anInt2103 == -1) {
                             continue;
                         }
@@ -329,7 +329,7 @@ final class Class1 {
                         if (0 == var28 || var28 == var58) {
                             var28 = 0;
                         } else {
-                            var76 = TextureOperation10.method350((byte) -88, -1 + var28);
+                            var76 = Class168.method350(-1 + var28);
                             if (var76.aBoolean2092 && var76.anInt2103 != -1) {
                                 var33 = var5[var13 + -1][1 + var14];
                                 var77 = var8[-1 + var13][1 + var14];
@@ -357,7 +357,7 @@ final class Class1 {
                         if (0 == var29 || var29 == var58) {
                             var29 = 0;
                         } else {
-                            var76 = TextureOperation10.method350((byte) -87, -1 + var29);
+                            var76 = Class168.method350(-1 + var29);
                             if (var76.aBoolean2092 && -1 != var76.anInt2103) {
                                 var33 = var5[var13 + -1][-1 + var14];
                                 var77 = var8[-1 + var13][var14 + -1];
@@ -385,7 +385,7 @@ final class Class1 {
                         if (var30 == 0 || var58 == var30) {
                             var30 = 0;
                         } else {
-                            var76 = TextureOperation10.method350((byte) -123, -1 + var30);
+                            var76 = Class168.method350(-1 + var30);
                             if (var76.aBoolean2092 && -1 != var76.anInt2103) {
                                 var33 = var5[1 + var13][var14 - 1];
                                 var77 = var8[1 + var13][var14 + -1];
@@ -413,7 +413,7 @@ final class Class1 {
                         if (var73 == 0 || var73 == var58) {
                             var73 = 0;
                         } else {
-                            var76 = TextureOperation10.method350((byte) 119, -1 + var73);
+                            var76 = Class168.method350(-1 + var73);
                             if (var76.aBoolean2092 && var76.anInt2103 != -1) {
                                 var77 = var8[1 + var13][1 + var14];
                                 var33 = var5[1 + var13][var14 + 1];
@@ -440,7 +440,7 @@ final class Class1 {
 
                         int var78;
                         if (var24 != 0 && var58 != var24) {
-                            var76 = TextureOperation10.method350((byte) 113, var24 - 1);
+                            var76 = Class168.method350(var24 - 1);
                             if (var76.aBoolean2092 && -1 != var76.anInt2103) {
                                 var65 = anIntArray2642[var8[var13][var14 - -1] * 4 + (2 + var5[var13][var14 - -1] & 3)];
 
@@ -458,7 +458,7 @@ final class Class1 {
                         }
 
                         if (var25 != 0 && var58 != var25) {
-                            var76 = TextureOperation10.method350((byte) -103, var25 + -1);
+                            var76 = Class168.method350(var25 + -1);
                             if (var76.aBoolean2092 && var76.anInt2103 != -1) {
                                 var21 = anIntArray2642[(3 & var5[var13 - 1][var14] - -3) + 4 * var8[var13 + -1][var14]];
 
@@ -476,7 +476,7 @@ final class Class1 {
                         }
 
                         if (var26 != 0 && var58 != var26) {
-                            var76 = TextureOperation10.method350((byte) 126, var26 - 1);
+                            var76 = Class168.method350(var26 - 1);
                             if (var76.aBoolean2092 && -1 != var76.anInt2103) {
                                 var22 = anIntArray2642[(var5[var13][var14 + -1] & 3) + 4 * var8[var13][-1 + var14]];
 
@@ -494,7 +494,7 @@ final class Class1 {
                         }
 
                         if (var27 != 0 && var27 != var58) {
-                            var76 = TextureOperation10.method350((byte) 116, var27 + -1);
+                            var76 = Class168.method350(var27 + -1);
                             if (var76.aBoolean2092 && var76.anInt2103 != -1) {
                                 var23 = anIntArray2642[4 * var8[1 + var13][var14] - -(3 & var5[var13 + 1][var14] - -1)];
 
@@ -517,7 +517,7 @@ final class Class1 {
                             var75 = TextureOperation8.aBooleanArrayArray3468[var25 == var78 ? var21 : 0];
                             var81 = TextureOperation8.aBooleanArrayArray3468[var26 == var78 ? var22 : 0];
                             boolean[] var84 = TextureOperation8.aBooleanArrayArray3468[var78 != var27 ? 0 : var23];
-                            Class168 var82 = TextureOperation10.method350((byte) 121, -1 + var78);
+                            Class168 var82 = Class168.method350(-1 + var78);
                             Class3_Sub11 var39 = method2052(var12, var82);
                             int var40 = TextureOperation34.method190(var82.anInt2095, var82.anInt2103, (byte) -76, var6[var13][var14]) << 8 | 255;
                             byte var44 = 6;

Client/src/main/java/org/runite/client/Class119.java

@@ -11,7 +11,7 @@ final class Class119 {
 
     static void method1729() {
         try {
-            Object var1;
+            Container var1;
             if (null == TextureOperation30.fullScreenFrame) {
                 if (GameShell.frame == null) {
                     var1 = Class38.gameSignlink.gameApplet;
@@ -22,8 +22,8 @@ final class Class119 {
                 var1 = TextureOperation30.fullScreenFrame;
             }
 
-            Unsorted.frameWidth = ((Container) var1).getSize().width;
+            Unsorted.frameWidth = var1.getSize().width;
-            Class70.frameHeight = ((Container) var1).getSize().height;
+            Class70.frameHeight = var1.getSize().height;
             Insets var2;
             if (var1 == GameShell.frame) {
                 var2 = GameShell.frame.getInsets();

Client/src/main/java/org/runite/client/Class129.java

@@ -129,7 +129,7 @@ abstract class Class129 {
                                     continue;
                                 }
 
-                                var27 = TextureOperation10.method350((byte) -103, var25 + -1);
+                                var27 = Class168.method350(var25 + -1);
                                 if (var27.anInt2103 == -1) {
                                     continue;
                                 }
@@ -141,7 +141,7 @@ abstract class Class129 {
                                     continue;
                                 }
                             } else if (var25 != 0) {
-                                var27 = TextureOperation10.method350((byte) 123, var25 - 1);
+                                var27 = Class168.method350(var25 - 1);
                                 byte var42;
                                 if (var27.anInt2103 == -1) {
                                     var42 = var7[var23][var19];
@@ -265,7 +265,7 @@ abstract class Class129 {
                                     continue;
                                 }
 
-                                var46 = TextureOperation10.method350((byte) -49, var43 - 1);
+                                var46 = Class168.method350(var43 - 1);
                                 if (-1 == var46.anInt2103) {
                                     continue;
                                 }
@@ -275,7 +275,7 @@ abstract class Class129 {
                                     continue;
                                 }
                             } else if (var43 != 0) {
-                                var46 = TextureOperation10.method350((byte) 113, -1 + var43);
+                                var46 = Class168.method350(-1 + var43);
                                 if (-1 == var46.anInt2103) {
                                     TextureOperation18.method284(var0, var9, var23, var6, var19, Class25.anIntArrayArray499[var7[var23][var19]], var14, (byte) 116, var13, var11, var2[var23][var19]);
                                     continue;

Client/src/main/java/org/runite/client/Class15.java

@@ -117,7 +117,7 @@ public final class Class15 implements Runnable {
                     if (var27 > var14) {
                         var15 = 255 & var4[var14][var34];
                         if (var15 > 0) {
-                            MapUnderlayColorDefinition var16 = Class158_Sub1.method629(var15 - 1);
+                            MapUnderlayColorDefinition var16 = MapUnderlayColorDefinition.method629(var15 - 1);
                             var28[var34] += var16.anInt1408;
                             var29[var34] += var16.anInt1406;
                             var30[var34] += var16.anInt1417;
@@ -130,7 +130,7 @@ public final class Class15 implements Runnable {
                     if (var15 >= 0) {
                         var35 = var4[var15][var34] & 0xFF;
                         if (0 < var35) {
-                            MapUnderlayColorDefinition var17 = Class158_Sub1.method629(-1 + var35);
+                            MapUnderlayColorDefinition var17 = MapUnderlayColorDefinition.method629(-1 + var35);
                             var28[var34] -= var17.anInt1408;
                             var29[var34] -= var17.anInt1406;
                             var30[var34] -= var17.anInt1417;

Client/src/main/java/org/runite/client/Class158_Sub1.java

@@ -1,21 +1,15 @@
 package org.runite.client;
+
 import org.rs09.client.data.ReferenceCache;
 
-import java.awt.Component;
+import java.awt.*;
-import java.awt.Graphics;
+import java.awt.image.*;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.image.ColorModel;
-import java.awt.image.DirectColorModel;
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageObserver;
-import java.awt.image.ImageProducer;
 
 final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserver {
 
     static RSString[] aClass94Array2977 = new RSString[5];
-    static int anInt3158 = -8 + (int)(17.0D * Math.random());
+    static int anInt3158 = -8 + (int) (17.0D * Math.random());
-    static int anInt1463 = -16 + (int)(Math.random() * 33.0D);
+    static int anInt1463 = -16 + (int) (Math.random() * 33.0D);
     static byte[][][] aByteArrayArrayArray1828;
     private ImageConsumer anImageConsumer2978;
     private ColorModel aColorModel2979;
@@ -23,62 +17,6 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
     static boolean aBoolean2981 = false;
     static ReferenceCache aReferenceCache_2982 = new ReferenceCache(32);
 
-    static MapUnderlayColorDefinition method629(int var1) {
-       try {
-          MapUnderlayColorDefinition var2 = (MapUnderlayColorDefinition)Class44.aReferenceCache_725.get(var1);
-          if(var2 == null) {
-             byte[] var3 = Class3_Sub23.aClass153_2536.getFile(1, var1);
-             var2 = new MapUnderlayColorDefinition();
-             if(null != var3) {
-                var2.parseUnderlayDefinition(var1, new DataBuffer(var3));
-             }
-
-             Class44.aReferenceCache_725.put(var2, var1);
-             return var2;
-          } else {
-             return var2;
-          }
-       } catch (RuntimeException var4) {
-          throw ClientErrorException.clientError(var4, "qc.B(" + true + ',' + var1 + ')');
-       }
-    }
-
-    static void method1629(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, int var19) {
-       int var21;
-       Class126 var20;
-       if(var3 == 0) {
-          var20 = new Class126(var10, var11, var12, var13, -1, var18, false);
-
-          for(var21 = var0; var21 >= 0; --var21) {
-             if(Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] == null) {
-                Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] = new Class3_Sub2(var21, var1, var2);
-             }
-          }
-
-          Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2].aClass126_2240 = var20;
-       } else if(var3 == 1) {
-          var20 = new Class126(var14, var15, var16, var17, var5, var19, var6 == var7 && var6 == var8 && var6 == var9);
-
-          for(var21 = var0; var21 >= 0; --var21) {
-             if(Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] == null) {
-                Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] = new Class3_Sub2(var21, var1, var2);
-             }
-          }
-
-          Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2].aClass126_2240 = var20;
-       } else {
-          Class35 var22 = new Class35(var3, var4, var5, var1, var2, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19);
-
-          for(var21 = var0; var21 >= 0; --var21) {
-             if(Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] == null) {
-                Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] = new Class3_Sub2(var21, var1, var2);
-             }
-          }
-
-          Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2].aClass35_2226 = var22;
-       }
-    }
-
 
     public final synchronized void addConsumer(ImageConsumer var1) {
         try {
@@ -88,27 +26,13 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
             var1.setColorModel(this.aColorModel2979);
             var1.setHints(14);
         } catch (RuntimeException var3) {
-         throw ClientErrorException.clientError(var3, "di.addConsumer(" + (var1 != null?"{...}":"null") + ')');
+            throw ClientErrorException.clientError(var3, "di.addConsumer(" + (var1 != null ? "{...}" : "null") + ')');
-      }
-   }
-
-   public static void method2187(int var0) {
-      try {
-         aClass94Array2977 = null;
-         aReferenceCache_2982 = null;
-         aClass3_Sub1_2980 = null;
-         if(var0 != 27316) {
-            aBoolean2981 = true;
-         }
-
-      } catch (RuntimeException var2) {
-         throw ClientErrorException.clientError(var2, "di.I(" + var0 + ')');
         }
     }
 
     private synchronized void method2188(int var1, int var2, int var3, int var5) {
         try {
-         if(null != this.anImageConsumer2978) {
+            if (null != this.anImageConsumer2978) {
                 this.anImageConsumer2978.setPixels(var3, var5, var1, var2, this.aColorModel2979, this.anIntArray2007, var5 * this.anInt2012 + var3, this.anInt2012);
                 this.anImageConsumer2978.imageComplete(2);
 
@@ -120,12 +44,12 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
 
     public final synchronized void removeConsumer(ImageConsumer var1) {
         try {
-         if(this.anImageConsumer2978 == var1) {
+            if (this.anImageConsumer2978 == var1) {
                 this.anImageConsumer2978 = null;
             }
 
         } catch (RuntimeException var3) {
-         throw ClientErrorException.clientError(var3, "di.removeConsumer(" + (var1 != null?"{...}":"null") + ')');
+            throw ClientErrorException.clientError(var3, "di.removeConsumer(" + (var1 != null ? "{...}" : "null") + ')');
         }
     }
 
@@ -137,7 +61,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
             var5.drawImage(this.anImage2009, 0, 0, this);
             var5.setClip(var7);
         } catch (RuntimeException var8) {
-         throw ClientErrorException.clientError(var8, "di.E(" + var1 + ',' + var2 + ',' + 6260 + ',' + var4 + ',' + (var5 != null?"{...}":"null") + ',' + var6 + ')');
+            throw ClientErrorException.clientError(var8, "di.E(" + var1 + ',' + var2 + ',' + 6260 + ',' + var4 + ',' + (var5 != null ? "{...}" : "null") + ',' + var6 + ')');
         }
     }
 
@@ -145,576 +69,13 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
         try {
             this.addConsumer(var1);
         } catch (RuntimeException var3) {
-         throw ClientErrorException.clientError(var3, "di.startProduction(" + (var1 != null?"{...}":"null") + ')');
+            throw ClientErrorException.clientError(var3, "di.startProduction(" + (var1 != null ? "{...}" : "null") + ')');
-      }
-   }
-
-   static void method2189(Class91[] var0, boolean var1, int var2) {
-      try {
-         int var4;
-         int var5;
-         if(!var1) {
-            for(var4 = 0; var4 < 4; ++var4) {
-               for(var5 = 0; var5 < 104; ++var5) {
-                  for(int var6 = 0; var6 < 104; ++var6) {
-                     if((1 & Unsorted.aByteArrayArrayArray113[var4][var5][var6]) == 1) {
-                        int var7 = var4;
-                        if((2 & Unsorted.aByteArrayArrayArray113[1][var5][var6]) == 2) {
-                           var7 = var4 - 1;
-                        }
-
-                        if(var7 >= 0) {
-                           var0[var7].method1497(var6, var5);
-                        }
-                     }
-                  }
-               }
-            }
-
-            anInt1463 += (int)(Math.random() * 5.0D) - 2;
-            if(anInt1463 < -16) {
-               anInt1463 = -16;
-            }
-
-            if(anInt1463 > 16) {
-               anInt1463 = 16;
-            }
-
-            anInt3158 += (int)(Math.random() * 5.0D) - 2;
-            if(-8 > anInt3158) {
-               anInt3158 = -8;
-            }
-
-            if(anInt3158 > 8) {
-               anInt3158 = 8;
-            }
-         }
-
-         byte var3;
-         if(var1) {
-            var3 = 1;
-         } else {
-            var3 = 4;
-         }
-
-         var4 = anInt3158 >> 2 << 10;
-         int[][] var34 = new int[104][104];
-         int[][] var35 = new int[104][104];
-         var5 = anInt1463 >> 1;
-
-         int var8;
-         int var10;
-         int var11;
-         int var13;
-         int var14;
-         int var15;
-         int var16;
-         int var19;
-         int var18;
-         int var20;
-         int var37;
-         int var44;
-         for(var8 = 0; var3 > var8; ++var8) {
-            byte[][] var9 = Class67.aByteArrayArrayArray1014[var8];
-            int var21;
-            int var23;
-            int var22;
-            int var24;
-            if(HDToolKit.highDetail) {
-               if(Class106.aBoolean1441) {
-                  for(var10 = 1; var10 < 103; ++var10) {
-                     for(var11 = 1; var11 < 103; ++var11) {
-                        var13 = (var9[1 + var11][var10] >> 3) + (var9[-1 + var11][var10] >> 2) - -(var9[var11][-1 + var10] >> 2) - -(var9[var11][1 + var10] >> 3) - -(var9[var11][var10] >> 1);
-                        byte var12 = 74;
-                        var35[var11][var10] = -var13 + var12;
-                     }
-                  }
-               } else {
-                  var10 = (int)Class92.light0Position[0];
-                  var11 = (int)Class92.light0Position[1];
-                  var37 = (int)Class92.light0Position[2];
-                  var13 = (int)Math.sqrt(var11 * var11 + (var10 * var10 - -(var37 * var37)));
-                  var14 = 1024 * var13 >> 8;
-
-                  for(var15 = 1; var15 < 103; ++var15) {
-                     for(var16 = 1; var16 < 103; ++var16) {
-                        byte var17 = 96;
-                        var18 = Class44.anIntArrayArrayArray723[var8][var16 - -1][var15] - Class44.anIntArrayArrayArray723[var8][-1 + var16][var15];
-                        var19 = Class44.anIntArrayArrayArray723[var8][var16][var15 + 1] - Class44.anIntArrayArrayArray723[var8][var16][-1 + var15];
-                        var20 = (int)Math.sqrt(var18 * var18 + 65536 + var19 * var19);
-                        var21 = (var18 << 8) / var20;
-                        var24 = (var9[var16][1 + var15] >> 3) + (var9[var16][var15 - 1] >> 2) + ((var9[var16 - 1][var15] >> 2) + (var9[var16 + 1][var15] >> 3) - -(var9[var16][var15] >> 1));
-                        var22 = -65536 / var20;
-                        var23 = (var19 << 8) / var20;
-                        var44 = var17 + (var37 * var23 + (var10 * var21 - -(var22 * var11))) / var14;
-                        var35[var16][var15] = var44 + -((int)((float)var24 * 1.7F));
-                     }
-                  }
-               }
-            } else {
-               var10 = (int)Math.sqrt(5100.0D);
-               var11 = 768 * var10 >> 8;
-
-               for(var37 = 1; var37 < 103; ++var37) {
-                  for(var13 = 1; 103 > var13; ++var13) {
-                     var16 = -Class44.anIntArrayArrayArray723[var8][var13][-1 + var37] + Class44.anIntArrayArrayArray723[var8][var13][var37 + 1];
-                     byte var41 = 74;
-                     var15 = -Class44.anIntArrayArrayArray723[var8][var13 + -1][var37] + Class44.anIntArrayArrayArray723[var8][var13 - -1][var37];
-                     var44 = (int)Math.sqrt(var15 * var15 - -65536 - -(var16 * var16));
-                     var20 = (var16 << 8) / var44;
-                     var19 = -65536 / var44;
-                     var18 = (var15 << 8) / var44;
-                     var21 = (var9[var13][var37] >> 1) + (var9[var13][-1 + var37] >> 2) + (var9[var13 - -1][var37] >> 3) + ((var9[var13 - 1][var37] >> 2) - -(var9[var13][var37 + 1] >> 3));
-                     var14 = var41 + (var20 * -50 + var18 * -50 - -(var19 * -10)) / var11;
-                     var35[var13][var37] = var14 - var21;
-                  }
-               }
-            }
-
-            for(var10 = 0; 104 > var10; ++var10) {
-               Class129.anIntArray1695[var10] = 0;
-               Unsorted.anIntArray1138[var10] = 0;
-               Class3_Sub31.anIntArray2606[var10] = 0;
-               MouseListeningClass.anIntArray1920[var10] = 0;
-               Unsorted.anIntArray2469[var10] = 0;
-            }
-
-            for(var10 = -5; var10 < 104; ++var10) {
-               for(var11 = 0; 104 > var11; ++var11) {
-                  var37 = var10 - -5;
-                  if(var37 < 104) {
-                     var13 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var37][var11];
-                     if(var13 > 0) {
-                        MapUnderlayColorDefinition var39 = method629(-1 + var13);
-                        Class129.anIntArray1695[var11] += var39.anInt1408;
-                        Unsorted.anIntArray1138[var11] += var39.anInt1406;
-                        Class3_Sub31.anIntArray2606[var11] += var39.anInt1417;
-                        MouseListeningClass.anIntArray1920[var11] += var39.anInt1418;
-                        ++Unsorted.anIntArray2469[var11];
-                     }
-                  }
-
-                  var13 = -5 + var10;
-                  if(0 <= var13) {
-                     var14 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var13][var11];
-                     if(var14 > 0) {
-                        MapUnderlayColorDefinition var42 = method629(-1 + var14);
-                        Class129.anIntArray1695[var11] -= var42.anInt1408;
-                        Unsorted.anIntArray1138[var11] -= var42.anInt1406;
-                        Class3_Sub31.anIntArray2606[var11] -= var42.anInt1417;
-                        MouseListeningClass.anIntArray1920[var11] -= var42.anInt1418;
-                        --Unsorted.anIntArray2469[var11];
-                     }
-                  }
-               }
-
-               if(var10 >= 0) {
-                  var11 = 0;
-                  var13 = 0;
-                  var37 = 0;
-                  var14 = 0;
-                  var15 = 0;
-
-                  for(var16 = -5; var16 < 104; ++var16) {
-                     var44 = var16 - -5;
-                     if(104 > var44) {
-                        var37 += Unsorted.anIntArray1138[var44];
-                        var15 += Unsorted.anIntArray2469[var44];
-                        var11 += Class129.anIntArray1695[var44];
-                        var14 += MouseListeningClass.anIntArray1920[var44];
-                        var13 += Class3_Sub31.anIntArray2606[var44];
-                     }
-
-                     var18 = var16 + -5;
-                     if(var18 >= 0) {
-                        var37 -= Unsorted.anIntArray1138[var18];
-                        var14 -= MouseListeningClass.anIntArray1920[var18];
-                        var11 -= Class129.anIntArray1695[var18];
-                        var15 -= Unsorted.anIntArray2469[var18];
-                        var13 -= Class3_Sub31.anIntArray2606[var18];
-                     }
-
-                     if(0 <= var16 && var15 > 0 && var14 != 0) {
-                        var34[var10][var16] = Class3_Sub8.method129(var13 / var15, var37 / var15, 256 * var11 / var14);
-                     }
-                  }
-               }
-            }
-
-            for(var10 = 1; var10 < 103; ++var10) {
-               label754:
-               for(var11 = 1; var11 < 103; ++var11) {
-                  if(var1 || NPC.method1986(66) || (2 & Unsorted.aByteArrayArrayArray113[0][var10][var11]) != 0 || (16 & Unsorted.aByteArrayArrayArray113[var8][var10][var11]) == 0 && PacketParser.method823(var11, var10, -87, var8) == Class140_Sub3.anInt2745) {
-                     if(var8 < Class85.anInt1174) {
-                        Class85.anInt1174 = var8;
-                     }
-
-                     var37 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var10][var11];
-                     var13 = aByteArrayArrayArray1828[var8][var10][var11] & 0xFF;
-                     if(0 < var37 || var13 > 0) {
-                        var15 = Class44.anIntArrayArrayArray723[var8][var10 + 1][var11];
-                        var14 = Class44.anIntArrayArrayArray723[var8][var10][var11];
-                        var44 = Class44.anIntArrayArrayArray723[var8][var10][1 + var11];
-                        var16 = Class44.anIntArrayArrayArray723[var8][1 + var10][var11 + 1];
-                        if(0 < var8) {
-                           boolean var47 = true;
-                           if(var37 == 0 && Unsorted.aByteArrayArrayArray1328[var8][var10][var11] != 0) {
-                              var47 = false;
-                           }
-
-                           if(var13 > 0 && !TextureOperation10.method350((byte)-73, var13 + -1).aBoolean2102) {
-                              var47 = false;
-                           }
-
-                           if(var47 && var14 == var15 && var16 == var14 && var14 == var44) {
-                              Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11], 4);
-                           }
-                        }
-
-                        if(var37 <= 0) {
-                           var18 = -1;
-                           var19 = 0;
-                        } else {
-                           var18 = var34[var10][var11];
-                           var20 = (var18 & 127) + var5;
-                           if(var20 >= 0) {
-                              if(var20 > 127) {
-                                 var20 = 127;
-                              }
-                           } else {
-                              var20 = 0;
-                           }
-
-                           var21 = (896 & var18) + (var18 + var4 & '\ufc00') + var20;
-                           var19 = Class51.anIntArray834[Unsorted.method1100(96, var21)];
-                        }
-
-                        var20 = var35[var10][var11];
-                        var23 = var35[var10][var11 + 1];
-                        var21 = var35[1 + var10][var11];
-                        var22 = var35[var10 - -1][var11 - -1];
-                        if(var13 == 0) {
-                           method1629(var8, var10, var11, 0, 0, -1, var14, var15, var16, var44, Unsorted.method1100(var20, var18), Unsorted.method1100(var21, var18), Unsorted.method1100(var22, var18), Unsorted.method1100(var23, var18), 0, 0, 0, 0, var19, 0);
-                           if(HDToolKit.highDetail && var8 > 0 && var18 != -1 && method629(-1 + var37).aBoolean1411) {
-                              Class141.method2037(0, 0, true, false, var10, var11, var14 - Class44.anIntArrayArrayArray723[0][var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11] + var15, var16 - Class44.anIntArrayArrayArray723[0][1 + var10][1 + var11], var44 - Class44.anIntArrayArrayArray723[0][var10][1 + var11]);
-                           }
-
-                           if(HDToolKit.highDetail && !var1 && TextureOperation16.anIntArrayArray3115 != null && 0 == var8) {
-                              for(var24 = var10 + -1; var10 - -1 >= var24; ++var24) {
-                                 for(int var52 = -1 + var11; var52 <= 1 + var11; ++var52) {
-                                    if((var24 != var10 || var11 != var52) && var24 >= 0 && var24 < 104 && 0 <= var52 && var52 < 104) {
-                                       int var54 = aByteArrayArrayArray1828[var8][var24][var52] & 0xFF;
-                                       if(var54 != 0) {
-                                          Class168 var53 = TextureOperation10.method350((byte)-25, -1 + var54);
-                                          if(var53.anInt2095 != -1 && 4 == Class51.anInterface2_838.method18(var53.anInt2095, 255)) {
-                                             TextureOperation16.anIntArrayArray3115[var10][var11] = var53.anInt2094 + (var53.anInt2101 << 24);
-                                             continue label754;
-                                          }
-                                       }
-                                    }
-                                 }
-                              }
-                           }
-                        } else {
-                           var24 = 1 + Unsorted.aByteArrayArrayArray1328[var8][var10][var11];
-                           byte var25 = PacketParser.aByteArrayArrayArray81[var8][var10][var11];
-                           Class168 var26 = TextureOperation10.method350((byte)-105, var13 + -1);
-                           int var27;
-                           int var29;
-                           int var28;
-                           if(HDToolKit.highDetail && !var1 && null != TextureOperation16.anIntArrayArray3115 && 0 == var8) {
-                              if(-1 != var26.anInt2095 && Class51.anInterface2_838.method18(var26.anInt2095, 255) == 4) {
-                                 TextureOperation16.anIntArrayArray3115[var10][var11] = (var26.anInt2101 << 24) + var26.anInt2094;
-                              } else {
-                                 label722:
-                                 for(var27 = var10 + -1; 1 + var10 >= var27; ++var27) {
-                                    for(var28 = var11 + -1; 1 + var11 >= var28; ++var28) {
-                                       if((var27 != var10 || var11 != var28) && var27 >= 0 && var27 < 104 && var28 >= 0 && var28 < 104) {
-                                          var29 = aByteArrayArrayArray1828[var8][var27][var28] & 0xFF;
-                                          if(var29 != 0) {
-                                             Class168 var30 = TextureOperation10.method350((byte)-14, -1 + var29);
-                                             if(var30.anInt2095 != -1 && Class51.anInterface2_838.method18(var30.anInt2095, 255) == 4) {
-                                                TextureOperation16.anIntArrayArray3115[var10][var11] = var30.anInt2094 + (var30.anInt2101 << 24);
-                                                break label722;
-                                             }
-                                          }
-                                       }
-                                    }
-                                 }
-                              }
-                           }
-
-                           var27 = var26.anInt2095;
-                           if(0 <= var27 && !Class51.anInterface2_838.method17(var27, 101)) {
-                              var27 = -1;
-                           }
-
-                           int var31;
-                           int var55;
-                           if(var27 < 0) {
-                              if(var26.anInt2103 == -1) {
-                                 var28 = -2;
-                                 var29 = 0;
-                              } else {
-                                 var28 = var26.anInt2103;
-                                 var55 = var5 + (var28 & 127);
-                                 if(var55 >= 0) {
-                                    if(var55 > 127) {
-                                       var55 = 127;
-                                    }
-                                 } else {
-                                    var55 = 0;
-                                 }
-
-                                 var31 = (var28 & 896) + (('\ufc00' & var28 + var4) - -var55);
-                                 var29 = Class51.anIntArray834[LinkableRSString.method729((byte)-85, var31, 96)];
-                              }
-                           } else {
-                              var28 = -1;
-                              var29 = Class51.anIntArray834[LinkableRSString.method729((byte)-126, Class51.anInterface2_838.method15(var27, 65535), 96)];
-                           }
-
-                           if(var26.anInt2098 >= 0) {
-                              var55 = var26.anInt2098;
-                              var31 = var5 + (var55 & 127);
-                              if(var31 >= 0) {
-                                 if(127 < var31) {
-                                    var31 = 127;
-                                 }
-                              } else {
-                                 var31 = 0;
-                              }
-
-                              int var32 = (896 & var55) + (('\ufc00' & var55 + var4) - -var31);
-                              var29 = Class51.anIntArray834[LinkableRSString.method729((byte)-101, var32, 96)];
-                           }
-
-                           method1629(var8, var10, var11, var24, var25, var27, var14, var15, var16, var44, Unsorted.method1100(var20, var18), Unsorted.method1100(var21, var18), Unsorted.method1100(var22, var18), Unsorted.method1100(var23, var18), LinkableRSString.method729((byte)-72, var28, var20), LinkableRSString.method729((byte)-107, var28, var21), LinkableRSString.method729((byte)-82, var28, var22), LinkableRSString.method729((byte)-93, var28, var23), var19, var29);
-                           if(HDToolKit.highDetail && var8 > 0) {
-                              Class141.method2037(var24, var25, var28 == -2 || !var26.aBoolean2093, -1 == var18 || !method629(-1 + var37).aBoolean1411, var10, var11, -Class44.anIntArrayArrayArray723[0][var10][var11] + var14, var15 - Class44.anIntArrayArrayArray723[0][1 + var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11 + 1] + var16, -Class44.anIntArrayArrayArray723[0][var10][1 + var11] + var44);
-                           }
-                        }
-                     }
-                  }
-               }
-            }
-
-            if(HDToolKit.highDetail) {
-               float[][] var38 = new float[105][105];
-               int[][] var45 = Class44.anIntArrayArrayArray723[var8];
-               float[][] var40 = new float[105][105];
-               float[][] var43 = new float[105][105];
-
-               for(var14 = 1; var14 <= 103; ++var14) {
-                  for(var15 = 1; var15 <= 103; ++var15) {
-                     var44 = var45[var15][var14 - -1] + -var45[var15][-1 + var14];
-                     var16 = -var45[var15 - 1][var14] + var45[var15 + 1][var14];
-                     float var51 = (float)Math.sqrt(var16 * var16 - -65536 - -(var44 * var44));
-                     var38[var15][var14] = (float)var16 / var51;
-                     var40[var15][var14] = -256.0F / var51;
-                     var43[var15][var14] = (float)var44 / var51;
-                  }
-               }
-
-               Class3_Sub11[] var50;
-               if(var1) {
-                  var50 = TextureOperation7.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], var35, var40, TextureOperation16.anIntArrayArray3115, aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], Class58.anIntArrayArrayArray914[0]);
-                  LinkedList.method1213(var8, var50);
-               } else {
-                  var50 = TextureOperation7.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], var35, var40, null, aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], null);
-                  Class3_Sub11[] var46 = Class1.method70(var40, var38, Class44.anIntArrayArrayArray723[var8], var8, var43, PacketParser.aByteArrayArrayArray81[var8], var35, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], aByteArrayArrayArray1828[var8], Unsorted.aByteArrayArrayArray113);
-                  Class3_Sub11[] var49 = new Class3_Sub11[var50.length - -var46.length];
-
-                  for(var44 = 0; var44 < var50.length; ++var44) {
-                     var49[var44] = var50[var44];
-                  }
-
-                  for(var44 = 0; var44 < var46.length; ++var44) {
-                     var49[var50.length + var44] = var46[var44];
-                  }
-
-                  LinkedList.method1213(var8, var49);
-                  Class129.method1769(var43, TextureOperation36.aByteArrayArrayArray3430[var8], PacketParser.aByteArrayArrayArray81[var8], Class68.aClass43Array1021, var8, Class68.anInt1032, var40, Unsorted.aByteArrayArrayArray1328[var8], aByteArrayArrayArray1828[var8], Class44.anIntArrayArrayArray723[var8], var38);
-               }
-            }
-
-            TextureOperation36.aByteArrayArrayArray3430[var8] = null;
-            aByteArrayArrayArray1828[var8] = null;
-            Unsorted.aByteArrayArrayArray1328[var8] = null;
-            PacketParser.aByteArrayArrayArray81[var8] = null;
-            Class67.aByteArrayArrayArray1014[var8] = null;
-         }
-
-         if(var2 <= 26) {
-            method2187(86);
-         }
-
-         Class128.method1764();
-         if(!var1) {
-            int var36;
-            for(var8 = 0; 104 > var8; ++var8) {
-               for(var36 = 0; var36 < 104; ++var36) {
-                  if((Unsorted.aByteArrayArrayArray113[1][var8][var36] & 2) == 2) {
-                     Class3_Sub28_Sub18.method709(var8, var36);
-                  }
-               }
-            }
-
-            for(var8 = 0; 4 > var8; ++var8) {
-               for(var36 = 0; var36 <= 104; ++var36) {
-                  for(var10 = 0; var10 <= 104; ++var10) {
-                     short var48;
-                     if((Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var36] & 1) != 0) {
-                        var14 = var8;
-
-                        for(var11 = var36; var11 > 0 && (1 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][-1 + var11]) != 0; --var11) {
-                        }
-
-                        var13 = var8;
-
-                        for(var37 = var36; var37 < 104 && (1 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var37 - -1]) != 0; ++var37) {
-                        }
-
-                        label453:
-                        while(var13 > 0) {
-                           for(var15 = var11; var15 <= var37; ++var15) {
-                              if((Class38_Sub1.anIntArrayArrayArray2609[var13 + -1][var10][var15] & 1) == 0) {
-                                 break label453;
-                              }
-                           }
-
-                           --var13;
-                        }
-
-                        label464:
-                        while(var14 < 3) {
-                           for(var15 = var11; var15 <= var37; ++var15) {
-                              if((1 & Class38_Sub1.anIntArrayArrayArray2609[var14 + 1][var10][var15]) == 0) {
-                                 break label464;
-                              }
-                           }
-
-                           ++var14;
-                        }
-
-                        var15 = (var14 - (-1 + var13)) * (-var11 + (var37 - -1));
-                        if(var15 >= 8) {
-                           var48 = 240;
-                           var44 = -var48 + Class44.anIntArrayArrayArray723[var14][var10][var11];
-                           var18 = Class44.anIntArrayArrayArray723[var13][var10][var11];
-                           Class167.method2263(1, 128 * var10, 128 * var10, 128 * var11, var37 * 128 + 128, var44, var18);
-
-                           for(var19 = var13; var19 <= var14; ++var19) {
-                              for(var20 = var11; var37 >= var20; ++var20) {
-                                 Class38_Sub1.anIntArrayArrayArray2609[var19][var10][var20] = Unsorted.bitwiseAnd(Class38_Sub1.anIntArrayArrayArray2609[var19][var10][var20], -2);
-                              }
-                           }
-                        }
-                     }
-
-                     if((2 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var36]) != 0) {
-                        for(var11 = var10; 0 < var11 && (Class38_Sub1.anIntArrayArrayArray2609[var8][-1 + var11][var36] & 2) != 0; --var11) {
-                        }
-
-                        var14 = var8;
-                        var13 = var8;
-
-                        for(var37 = var10; 104 > var37 && (2 & Class38_Sub1.anIntArrayArrayArray2609[var8][var37 - -1][var36]) != 0; ++var37) {
-                        }
-
-                        label503:
-                        while(var13 > 0) {
-                           for(var15 = var11; var15 <= var37; ++var15) {
-                              if(0 == (2 & Class38_Sub1.anIntArrayArrayArray2609[-1 + var13][var15][var36])) {
-                                 break label503;
-                              }
-                           }
-
-                           --var13;
-                        }
-
-                        label514:
-                        while(var14 < 3) {
-                           for(var15 = var11; var15 <= var37; ++var15) {
-                              if((2 & Class38_Sub1.anIntArrayArrayArray2609[var14 + 1][var15][var36]) == 0) {
-                                 break label514;
-                              }
-                           }
-
-                           ++var14;
-                        }
-
-                        var15 = (-var11 + var37 - -1) * (-var13 + var14 - -1);
-                        if(8 <= var15) {
-                           var48 = 240;
-                           var44 = Class44.anIntArrayArrayArray723[var14][var11][var36] - var48;
-                           var18 = Class44.anIntArrayArrayArray723[var13][var11][var36];
-                           Class167.method2263(2, var11 * 128, 128 * var37 + 128, 128 * var36, var36 * 128, var44, var18);
-
-                           for(var19 = var13; var14 >= var19; ++var19) {
-                              for(var20 = var11; var20 <= var37; ++var20) {
-                                 Class38_Sub1.anIntArrayArrayArray2609[var19][var20][var36] = Unsorted.bitwiseAnd(Class38_Sub1.anIntArrayArrayArray2609[var19][var20][var36], -3);
-                              }
-                           }
-                        }
-                     }
-
-                     if((4 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var36]) != 0) {
-                        var11 = var10;
-                        var37 = var10;
-
-                        for(var13 = var36; 0 < var13 && 0 != (4 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][-1 + var13]); --var13) {
-                        }
-
-                        for(var14 = var36; var14 < 104 && (Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var14 + 1] & 4) != 0; ++var14) {
-                        }
-
-                        label554:
-                        while(var11 > 0) {
-                           for(var15 = var13; var14 >= var15; ++var15) {
-                              if(0 == (Class38_Sub1.anIntArrayArrayArray2609[var8][var11 + -1][var15] & 4)) {
-                                 break label554;
-                              }
-                           }
-
-                           --var11;
-                        }
-
-                        label565:
-                        while(var37 < 104) {
-                           for(var15 = var13; var14 >= var15; ++var15) {
-                              if(0 == (4 & Class38_Sub1.anIntArrayArrayArray2609[var8][1 + var37][var15])) {
-                                 break label565;
-                              }
-                           }
-
-                           ++var37;
-                        }
-
-                        if(4 <= (1 + -var11 + var37) * (var14 - (var13 - 1))) {
-                           var15 = Class44.anIntArrayArrayArray723[var8][var11][var13];
-                           Class167.method2263(4, var11 * 128, 128 * var37 - -128, var13 * 128, 128 + 128 * var14, var15, var15);
-
-                           for(var16 = var11; var37 >= var16; ++var16) {
-                              for(var44 = var13; var14 >= var44; ++var44) {
-                                 Class38_Sub1.anIntArrayArrayArray2609[var8][var16][var44] = Unsorted.bitwiseAnd(Class38_Sub1.anIntArrayArrayArray2609[var8][var16][var44], -5);
-                              }
-                           }
-                        }
-                     }
-                  }
-               }
-            }
-         }
-
-      } catch (RuntimeException var33) {
-         throw ClientErrorException.clientError(var33, "di.K(" + (var0 != null?"{...}":"null") + ',' + var1 + ',' + var2 + ')');
         }
     }
 
     private synchronized void method2190() {
         try {
-         if(this.anImageConsumer2978 != null) {
+            if (this.anImageConsumer2978 != null) {
                 this.anImageConsumer2978.setPixels(0, 0, this.anInt2012, this.anInt2011, this.aColorModel2979, this.anIntArray2007, 0, this.anInt2012);
                 this.anImageConsumer2978.imageComplete(2);
             }
@@ -727,7 +88,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
         try {
             return this.anImageConsumer2978 == var1;
         } catch (RuntimeException var3) {
-         throw ClientErrorException.clientError(var3, "di.isConsumer(" + (var1 != null?"{...}":"null") + ')');
+            throw ClientErrorException.clientError(var3, "di.isConsumer(" + (var1 != null ? "{...}" : "null") + ')');
         }
     }
 
@@ -735,8 +96,8 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
         try {
             int var12;
             int var13;
-         for(var12 = 0; var12 < 104; ++var12) {
+            for (var12 = 0; var12 < 104; ++var12) {
-            for(var13 = 0; var13 < 104; ++var13) {
+                for (var13 = 0; var13 < 104; ++var13) {
                     Class84.anIntArrayArray1160[var12][var13] = 0;
                     Class97.anIntArrayArray1373[var12][var13] = 99999999;
                 }
@@ -755,34 +116,34 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
             int[][] var17 = AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].anIntArrayArray1304;
 
             int var18;
-          while(var15 != var27) {
+            while (var15 != var27) {
                 var13 = Class45.anIntArray729[var15];
                 var12 = TextureOperation38.anIntArray3456[var15];
                 var15 = 4095 & var15 + 1;
-             if(var12 == var0 && var13 == var4) {
+                if (var12 == var0 && var13 == var4) {
                     var16 = true;
                     break;
                 }
 
-             if(var9 != 0) {
+                if (var9 != 0) {
-                if((var9 < 5 || 10 == var9) && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1488(var4, var12, var13, var0, var9 + -1, 1, var7)) {
+                    if ((var9 < 5 || 10 == var9) && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1488(var4, var12, var13, var0, var9 + -1, 1, var7)) {
                         var16 = true;
                         break;
                     }
 
-                if(var9 < 10 && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1492(var4, -1 + var9, var0, var13, 1, var7, var12, 95)) {
+                    if (var9 < 10 && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1492(var4, -1 + var9, var0, var13, 1, var7, var12, 95)) {
                         var16 = true;
                         break;
                     }
                 }
 
-             if(var11 != 0 && 0 != var6 && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1498(var0, var13, var12, 1, var11, var1, var4, var6)) {
+                if (var11 != 0 && 0 != var6 && AtmosphereParser.aClass91Array1182[WorldListCountry.localPlane].method1498(var0, var13, var12, 1, var11, var1, var4, var6)) {
                     var16 = true;
                     break;
                 }
 
                 var18 = 1 + Class97.anIntArrayArray1373[var12][var13];
-             if(0 < var12 && Class84.anIntArrayArray1160[var12 + -1][var13] == 0 && (19661064 & var17[var12 + -1][var13]) == 0) {
+                if (0 < var12 && Class84.anIntArrayArray1160[var12 + -1][var13] == 0 && (19661064 & var17[var12 + -1][var13]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = -1 + var12;
                     Class45.anIntArray729[var27] = var13;
                     var27 = var27 - -1 & 4095;
@@ -790,7 +151,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[-1 + var12][var13] = var18;
                 }
 
-             if(103 > var12 && Class84.anIntArrayArray1160[var12 + 1][var13] == 0 && (var17[var12 + 1][var13] & 19661184) == 0) {
+                if (103 > var12 && Class84.anIntArrayArray1160[var12 + 1][var13] == 0 && (var17[var12 + 1][var13] & 19661184) == 0) {
                     TextureOperation38.anIntArray3456[var27] = var12 - -1;
                     Class45.anIntArray729[var27] = var13;
                     var27 = 1 + var27 & 4095;
@@ -798,7 +159,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[1 + var12][var13] = var18;
                 }
 
-             if(var13 > 0 && Class84.anIntArrayArray1160[var12][var13 - 1] == 0 && (19661058 & var17[var12][-1 + var13]) == 0) {
+                if (var13 > 0 && Class84.anIntArrayArray1160[var12][var13 - 1] == 0 && (19661058 & var17[var12][-1 + var13]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = var12;
                     Class45.anIntArray729[var27] = -1 + var13;
                     Class84.anIntArrayArray1160[var12][var13 - 1] = 1;
@@ -806,7 +167,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[var12][-1 + var13] = var18;
                 }
 
-             if(103 > var13 && Class84.anIntArrayArray1160[var12][1 + var13] == 0 && (19661088 & var17[var12][var13 + 1]) == 0) {
+                if (103 > var13 && Class84.anIntArrayArray1160[var12][1 + var13] == 0 && (19661088 & var17[var12][var13 + 1]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = var12;
                     Class45.anIntArray729[var27] = var13 - -1;
                     var27 = 1 + var27 & 4095;
@@ -814,7 +175,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[var12][var13 - -1] = var18;
                 }
 
-             if(var12 > 0 && var13 > 0 && Class84.anIntArrayArray1160[-1 + var12][var13 - 1] == 0 && (var17[var12 - 1][-1 + var13] & 19661070) == 0 && (19661064 & var17[var12 - 1][var13]) == 0 && (19661058 & var17[var12][-1 + var13]) == 0) {
+                if (var12 > 0 && var13 > 0 && Class84.anIntArrayArray1160[-1 + var12][var13 - 1] == 0 && (var17[var12 - 1][-1 + var13] & 19661070) == 0 && (19661064 & var17[var12 - 1][var13]) == 0 && (19661058 & var17[var12][-1 + var13]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = -1 + var12;
                     Class45.anIntArray729[var27] = var13 + -1;
                     var27 = 1 + var27 & 4095;
@@ -822,7 +183,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[var12 - 1][var13 + -1] = var18;
                 }
 
-             if(var12 < 103 && 0 < var13 && Class84.anIntArrayArray1160[var12 - -1][var13 - 1] == 0 && 0 == (19661187 & var17[var12 - -1][-1 + var13]) && (19661184 & var17[var12 - -1][var13]) == 0 && (19661058 & var17[var12][-1 + var13]) == 0) {
+                if (var12 < 103 && 0 < var13 && Class84.anIntArrayArray1160[var12 - -1][var13 - 1] == 0 && 0 == (19661187 & var17[var12 - -1][-1 + var13]) && (19661184 & var17[var12 - -1][var13]) == 0 && (19661058 & var17[var12][-1 + var13]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = var12 + 1;
                     Class45.anIntArray729[var27] = -1 + var13;
                     var27 = 4095 & var27 + 1;
@@ -830,7 +191,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[var12 - -1][-1 + var13] = var18;
                 }
 
-             if(0 < var12 && var13 < 103 && 0 == Class84.anIntArrayArray1160[var12 + -1][var13 + 1] && 0 == (19661112 & var17[var12 + -1][1 + var13]) && 0 == (var17[var12 + -1][var13] & 19661064) && (19661088 & var17[var12][1 + var13]) == 0) {
+                if (0 < var12 && var13 < 103 && 0 == Class84.anIntArrayArray1160[var12 + -1][var13 + 1] && 0 == (19661112 & var17[var12 + -1][1 + var13]) && 0 == (var17[var12 + -1][var13] & 19661064) && (19661088 & var17[var12][1 + var13]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = var12 - 1;
                     Class45.anIntArray729[var27] = 1 + var13;
                     Class84.anIntArrayArray1160[-1 + var12][var13 - -1] = 6;
@@ -838,7 +199,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     Class97.anIntArrayArray1373[-1 + var12][1 + var13] = var18;
                 }
 
-             if(var12 < 103 && var13 < 103 && Class84.anIntArrayArray1160[var12 - -1][1 + var13] == 0 && (19661280 & var17[1 + var12][var13 + 1]) == 0 && (var17[1 + var12][var13] & 19661184) == 0 && (19661088 & var17[var12][var13 - -1]) == 0) {
+                if (var12 < 103 && var13 < 103 && Class84.anIntArrayArray1160[var12 - -1][1 + var13] == 0 && (19661280 & var17[1 + var12][var13 + 1]) == 0 && (var17[1 + var12][var13] & 19661184) == 0 && (19661088 & var17[var12][var13 - -1]) == 0) {
                     TextureOperation38.anIntArray3456[var27] = var12 + 1;
                     Class45.anIntArray729[var27] = var13 - -1;
                     Class84.anIntArrayArray1160[var12 + 1][1 + var13] = 12;
@@ -849,8 +210,8 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
 
             Class129.anInt1692 = 0;
             int var19;
-          if(!var16) {
+            if (!var16) {
-             if(!var8) {
+                if (!var8) {
                     return false;
                 }
 
@@ -858,19 +219,19 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                 var19 = 100;
                 byte var20 = 10;
 
-             for(int var21 = var0 + -var20; var20 + var0 >= var21; ++var21) {
+                for (int var21 = var0 + -var20; var20 + var0 >= var21; ++var21) {
-                for(int var22 = var4 + -var20; var4 - -var20 >= var22; ++var22) {
+                    for (int var22 = var4 + -var20; var4 - -var20 >= var22; ++var22) {
-                   if(var21 >= 0 && var22 >= 0 && 104 > var21 && var22 < 104 && 100 > Class97.anIntArrayArray1373[var21][var22]) {
+                        if (var21 >= 0 && var22 >= 0 && 104 > var21 && var22 < 104 && 100 > Class97.anIntArrayArray1373[var21][var22]) {
                             int var24 = 0;
-                      if(var4 > var22) {
+                            if (var4 > var22) {
                                 var24 = var4 + -var22;
-                      } else if(var6 + var4 - 1 < var22) {
+                            } else if (var6 + var4 - 1 < var22) {
                                 var24 = 1 + (-var4 - var6) + var22;
                             }
 
                             int var23 = 0;
-                      if(var0 <= var21) {
+                            if (var0 <= var21) {
-                         if(-1 + var11 + var0 < var21) {
+                                if (-1 + var11 + var0 < var21) {
                                     var23 = 1 - var11 - (var0 - var21);
                                 }
                             } else {
@@ -878,7 +239,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                             }
 
                             int var25 = var24 * var24 + var23 * var23;
-                      if(var18 > var25 || var18 == var25 && Class97.anIntArrayArray1373[var21][var22] < var19) {
+                            if (var18 > var25 || var18 == var25 && Class97.anIntArrayArray1373[var21][var22] < var19) {
                                 var13 = var22;
                                 var18 = var25;
                                 var12 = var21;
@@ -888,11 +249,11 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                     }
                 }
 
-             if(var18 == 1000) {
+                if (var18 == 1000) {
                     return false;
                 }
 
-             if(var2 == var12 && var10 == var13) {
+                if (var2 == var12 && var10 == var13) {
                     return false;
                 }
 
@@ -904,23 +265,23 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
             var15 = var28 + 1;
             Class45.anIntArray729[var28] = var13;
 
-          for(var18 = var19 = Class84.anIntArrayArray1160[var12][var13]; var2 != var12 || var13 != var10; var18 = Class84.anIntArrayArray1160[var12][var13]) {
+            for (var18 = var19 = Class84.anIntArrayArray1160[var12][var13]; var2 != var12 || var13 != var10; var18 = Class84.anIntArrayArray1160[var12][var13]) {
-             if(var19 != var18) {
+                if (var19 != var18) {
                     var19 = var18;
                     TextureOperation38.anIntArray3456[var15] = var12;
                     Class45.anIntArray729[var15++] = var13;
                 }
 
-             if((var18 & 2) == 0) {
+                if ((var18 & 2) == 0) {
-                if(0 != (8 & var18)) {
+                    if (0 != (8 & var18)) {
                         --var12;
                     }
                 } else {
                     ++var12;
                 }
 
-             if((1 & var18) == 0) {
+                if ((1 & var18) == 0) {
-                if(0 != (4 & var18)) {
+                    if (0 != (4 & var18)) {
                         --var13;
                     }
                 } else {
@@ -928,7 +289,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
                 }
             }
 
-          if(var15 > 0) {
+            if (var15 > 0) {
                 TextureOperation7.method299(100, var15, var5);
                 return true;
             } else return var5 != 1;
@@ -942,7 +303,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
             this.method2190();
             var3.drawImage(this.anImage2009, 0, 0, this);
         } catch (RuntimeException var6) {
-         throw ClientErrorException.clientError(var6, "di.C(" + 0 + ',' + 0 + ',' + (var3 != null?"{...}":"null") + ',' + 0 + ')');
+            throw ClientErrorException.clientError(var6, "di.C(" + 0 + ',' + 0 + ',' + (var3 != null ? "{...}" : "null") + ',' + 0 + ')');
         }
     }
 
@@ -962,7 +323,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
             this.method2182();
 
         } catch (RuntimeException var6) {
-         throw ClientErrorException.clientError(var6, "di.F(" + var1 + ',' + false + ',' + var3 + ',' + (var4 != null?"{...}":"null") + ')');
+            throw ClientErrorException.clientError(var6, "di.F(" + var1 + ',' + false + ',' + var3 + ',' + (var4 != null ? "{...}" : "null") + ')');
         }
     }
 
@@ -970,18 +331,11 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv
         try {
             return true;
         } catch (RuntimeException var8) {
-         throw ClientErrorException.clientError(var8, "di.imageUpdate(" + (var1 != null?"{...}":"null") + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ')');
+            throw ClientErrorException.clientError(var8, "di.imageUpdate(" + (var1 != null ? "{...}" : "null") + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ',' + var6 + ')');
         }
     }
 
-//   static void method2192() {
+    public final void requestTopDownLeftRightResend(ImageConsumer var1) {
-//      try {
+    }
-//         RenderAnimationDefinition.aReferenceCache_1955.clearSoftReferences();
-//      } catch (RuntimeException var2) {
-//         throw ClientErrorException.clientError(var2, "di.M(" + -68 + ')');
-//      }
-//   }
-
-   public final void requestTopDownLeftRightResend(ImageConsumer var1) {}
 
 }

Client/src/main/java/org/runite/client/Class158_Sub2.java

@@ -1,13 +1,7 @@
 package org.runite.client;
-import java.awt.Component;
+
-import java.awt.Graphics;
+import java.awt.*;
-import java.awt.Point;
+import java.awt.image.*;
-import java.awt.Shape;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
-import java.awt.image.DirectColorModel;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
 import java.util.Hashtable;
 
 public final class Class158_Sub2 extends Class158 {

Client/src/main/java/org/runite/client/Class164_Sub1.java

@@ -3,7 +3,6 @@ package org.runite.client;
 class Class164_Sub1 extends Class164 {
 
    private int anInt3010;
-   static short[] aShortArray3011 = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550};
    static int anInt3012 = 0;
    private final int[] anIntArray3014;
    private byte[] aByteArray3015;

Client/src/main/java/org/runite/client/Class167.java

@@ -2,7 +2,7 @@ package org.runite.client;
 
 public final class Class167 {
 
-    static RSString aClass94_2083 = null;
+    public static RSString aClass94_2083 = null;
     static int anInt2087 = 0;
 
 

Client/src/main/java/org/runite/client/Class168.java

@@ -925,6 +925,24 @@ final class Class168 {
         }
     }
 
+    static Class168 method350(int var1) {
+       try {
+          Class168 var2 = (Class168)Class163_Sub2_Sub1.aReferenceCache_4015.get(var1);
+          if(null == var2) {
+             byte[] var4 = Class3_Sub28_Sub5.aClass153_3580.getFile(4, var1);
+             var2 = new Class168();
+             if(var4 != null) {
+                var2.method2274(new DataBuffer(var4), var1);
+             }
+
+             Class163_Sub2_Sub1.aReferenceCache_4015.put(var2, var1);
+          }
+           return var2;
+       } catch (RuntimeException var5) {
+          throw ClientErrorException.clientError(var5, "um.C(" + ',' + var1 + ')');
+       }
+    }
+
     final void method2274(DataBuffer var2, int var3) {
         try {
             while (true) {

Client/src/main/java/org/runite/client/Class169.java

@@ -116,8 +116,7 @@ final class Class169 {
             var6 += var5 - 128;
         }
 
-        if (var7 == this.anInt2112) {
+        if (var7 != this.anInt2112) {
-        } else {
             this.anInt2112 = var7;
             var6 = var2 * 128 + 1 + (var3 * 128 + 1) * var5;
             var8 = 0;
@@ -158,6 +157,7 @@ final class Class169 {
             var13.limit(16384);
             HDToolKit.bindTexture2D(this.anInt2108);
             var12.glTexImage2D(3553, 0, 6406, 128, 128, 0, 6406, 5121, var13);
+
         }
     }
 

Client/src/main/java/org/runite/client/Class24.java

@@ -123,7 +123,7 @@ public final class Class24 {
     static void method950(RSInterface var0, int var1, int var2, int var3) {
         try {
             if (2 <= Unsorted.menuOptionCount || Class164_Sub1.anInt3012 != 0 || GameObject.aBoolean1837) {
-                RSString var4 = Class3_Sub28_Sub1.method531();
+                RSString var4 = method531();
                 if (var0 == null) {
                     int var5 = FontType.bold.method683(var4, 4 + var3, var2 - -15, aRandom3088, Class38_Sub1.anInt2618);
                     Class21.method1340(4 + var3, FontType.bold.method682(var4) + var5, var2, 15);
@@ -157,6 +157,39 @@ public final class Class24 {
         }
     }
 
+    static RSString method531() {
+        RSString var1;
+        if (Class164_Sub1.anInt3012 == 1 && Unsorted.menuOptionCount < 2) {
+            var1 = RSString.stringCombiner(new RSString[]{TextCore.HasUse, TextCore.Spacer, RenderAnimationDefinition.aClass94_378, TextCore.aClass94_1724});
+        } else if (GameObject.aBoolean1837 && 2 > Unsorted.menuOptionCount) {
+            var1 = RSString.stringCombiner(new RSString[]{Class3_Sub28_Sub9.aClass94_3621, TextCore.Spacer, TextCore.aClass94_676, TextCore.aClass94_1724});
+
+        } else if (ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2 && !ObjectDefinition.aBooleanArray1490[82]) {
+            for (Class3_Sub28_Sub1.counter = 2; Class3_Sub28_Sub1.counter < Unsorted.menuOptionCount; Class3_Sub28_Sub1.counter++) {
+                RSString option = (Unsorted.method802(Unsorted.menuOptionCount - Class3_Sub28_Sub1.counter));
+                if (option.toString().contains("Drop") || option.toString().contains("Release")) {
+                    ClientCommands.canDrop = true;
+                    Class3_Sub28_Sub1.dropAction = Class3_Sub28_Sub1.counter;
+                    break;
+                } else {
+                    ClientCommands.canDrop = false;
+                }
+            }
+            if (ClientCommands.canDrop) {
+                var1 = Unsorted.method802(Unsorted.menuOptionCount - Class3_Sub28_Sub1.dropAction);
+            } else {
+                var1 = Unsorted.method802(Unsorted.menuOptionCount - 1);
+            }
+        } else {
+            var1 = Unsorted.method802(Unsorted.menuOptionCount - 1);
+        }
+
+        if (Unsorted.menuOptionCount > 2) {
+            var1 = RSString.stringCombiner(new RSString[]{var1, Class1.aClass94_58, RSString.stringAnimator(Unsorted.menuOptionCount - 2), TextCore.HasMoreOptions});
+        }
+        return var1;
+    }
+
     final Model_Sub1 method941() {
         try {
             int var3 = 0;

Client/src/main/java/org/runite/client/Class36.java

@@ -141,7 +141,7 @@ final class Class36 {
         try {
 
             for (int var4 = 0; var4 < Client.anInt869; ++var4) {
-                Class168 var5 = TextureOperation10.method350((byte) 120, var4);
+                Class168 var5 = Class168.method350(var4);
                 if (null != var5) {
                     int var6 = var5.anInt2095;
                     if (0 <= var6 && !Class51.anInterface2_838.method17(var6, 126)) {

Client/src/main/java/org/runite/client/Class3_Sub17.java

@@ -2,7 +2,7 @@ package org.runite.client;
 
 import org.rs09.client.Linkable;
 
-final class Class3_Sub17 extends Linkable {
+public final class Class3_Sub17 extends Linkable {
 
 	int anInt2454;
 	int[] anIntArray2455;
@@ -14,22 +14,8 @@ final class Class3_Sub17 extends Linkable {
 
 	private static RSString aClass94_2465 = RSString.parse("");
 	int[] anIntArray2466;
-	static RSString aClass94_2464 = aClass94_2465;
 
-	public static void method380(int var0) {
+	static void method381() {
-		try {
-			aClass94_2464 = null;
-			if(var0 != -29113) {
-				method381(false);
-			}
-
-			aClass94_2465 = null;
-		} catch (RuntimeException var2) {
-			throw ClientErrorException.clientError(var2, "jm.B(" + var0 + ')');
-		}
-	}
-
-	static void method381(boolean var0) {
 		try {
 			if(ConfigInventoryDefinition.anInt3655 != -1) {
 				Class52.method1160(-120, ConfigInventoryDefinition.anInt3655);
@@ -52,9 +38,6 @@ final class Class3_Sub17 extends Linkable {
 			}
 
 			Unsorted.anInt2567 = -1;
-			if(!var0) {
-				method380(-78);
-			}
 
 			if(ConfigInventoryDefinition.anInt3655 != -1) {
 				Class3_Sub28_Sub3.anInt3557 = 0;
@@ -69,7 +52,7 @@ final class Class3_Sub17 extends Linkable {
 
 			Class106.anInt1446 = 0;
 		} catch (RuntimeException var2) {
-			throw ClientErrorException.clientError(var2, "jm.A(" + var0 + ')');
+			throw ClientErrorException.clientError(var2, "jm.A(" + ')');
 		}
 	}
 

Client/src/main/java/org/runite/client/Class3_Sub23.java

@@ -5,12 +5,12 @@ import org.rs09.client.rendering.Toolkit;
 
 import java.util.Objects;
 
-final class Class3_Sub23 extends Linkable {
+public final class Class3_Sub23 extends Linkable {
 
     static RSString aClass94_3080 = Class95.method1586();
     int anInt2531;
     int anInt2532;
-   static int[] anIntArray2533;
+    public static int[] anIntArray2533;
     static int anInt2535 = -2;
     static CacheIndex aClass153_2536;
     static int anInt2537 = 0;
@@ -19,54 +19,27 @@ final class Class3_Sub23 extends Linkable {
     static Class3_Sub11[][] aClass3_Sub11ArrayArray2542;
 
 
-   static void method406(byte var0, boolean var1, Font var2) {
-      try {
-         int var3;
-         if(HDToolKit.highDetail || var1) {
-            var3 = Class140_Sub7.canvasHeight;
-            int var4 = var3 * 956 / 503;
-            Class40.aAbstractSprite_680.method639((Class23.canvasWidth + -var4) / 2, 0, var4, var3);
-            SequenceDefinition.aClass109_1856.method1667(-(SequenceDefinition.aClass109_1856.width / 2) + Class23.canvasWidth / 2, 18);
-         }
-
-         var2.method699(TextCore.RSLoadingPleaseWait, Class23.canvasWidth / 2, Class140_Sub7.canvasHeight / 2 - 26, 16777215, -1);
-         var3 = Class140_Sub7.canvasHeight / 2 + -18;
-         Toolkit.getActiveToolkit().drawRect(Class23.canvasWidth / 2 - 152, var3, 304, 34, 9179409, 255);
-         Toolkit.getActiveToolkit().drawRect(-151 + Class23.canvasWidth / 2, var3 - -1, 302, 32, 0, 255);
-         Toolkit.getActiveToolkit().method934(Class23.canvasWidth / 2 - 150, var3 + 2, Client.LoadingStageNumber * 3, 30, 9179409);
-         Toolkit.getActiveToolkit().method934(Class23.canvasWidth / 2 + -150 - -(3 * Client.LoadingStageNumber), 2 + var3, 300 + -(3 * Client.LoadingStageNumber), 30, 0);
-
-         var2.method699(Class3_Sub17.aClass94_2464, Class23.canvasWidth / 2, 4 + Class140_Sub7.canvasHeight / 2, 16777215, -1);
-         if(var0 < 50) {
-            anIntArray2533 = null;
-         }
-
-      } catch (RuntimeException var5) {
-         throw ClientErrorException.clientError(var5, "oj.D(" + var0 + ',' + var1 + ',' + (var2 != null?"{...}":"null") + ')');
-      }
-   }
-
    static RSString method407(int var0, boolean var1, int var2, long var3) {
         try {
             RSString var6 = Unsorted.emptyString(0);
-         if(var3 < 0) {
+            if (var3 < 0) {
                 var3 = -var3;
                 Objects.requireNonNull(var6).append(RSString.parse(")2"));
             }
 
             RSString var8 = TextCore.aClass94_1880;
             RSString var7 = TextCore.aClass94_341;
-         if(var0 == 1) {
+            if (var0 == 1) {
                 var8 = TextCore.aClass94_341;
                 var7 = TextCore.aClass94_1880;
             }
 
-         if(var0 == 2) {
+            if (var0 == 2) {
                 var7 = TextCore.aClass94_1880;
                 var8 = aClass94_3080;
             }
 
-         if(var0 == 3) {
+            if (var0 == 3) {
                 var8 = TextCore.aClass94_341;
                 var7 = TextCore.aClass94_1880;
             }
@@ -74,30 +47,30 @@ final class Class3_Sub23 extends Linkable {
             RSString var10 = Unsorted.emptyString(0);
 
             int var11;
-         for(var11 = 0; var2 > var11; ++var11) {
+            for (var11 = 0; var2 > var11; ++var11) {
-            Objects.requireNonNull(var10).append(RSString.stringAnimator((int)(var3 % 10L)));
+                Objects.requireNonNull(var10).append(RSString.stringAnimator((int) (var3 % 10L)));
                 var3 /= 10L;
             }
 
             var11 = 0;
             RSString var9;
-         if(var3 == 0L) {
+            if (var3 == 0L) {
                 var9 = RSString.parse("0");
             } else {
                 RSString var12;
-            for(var12 = Unsorted.emptyString(0); var3 > 0L; var3 /= 10L) {
+                for (var12 = Unsorted.emptyString(0); var3 > 0L; var3 /= 10L) {
-               if(var1 && var11 != 0 && var11 % 3 == 0) {
+                    if (var1 && var11 != 0 && var11 % 3 == 0) {
                         var12.append(var8);
                     }
 
-               Objects.requireNonNull(var12).append(RSString.stringAnimator((int)(var3 % 10L)));
+                    Objects.requireNonNull(var12).append(RSString.stringAnimator((int) (var3 % 10L)));
                     ++var11;
                 }
 
                 var9 = var12;
             }
 
-          if(Objects.requireNonNull(var10).length() > 0) {
+            if (Objects.requireNonNull(var10).length() > 0) {
                 var10.append(var7);
             }
 
@@ -113,7 +86,7 @@ final class Class3_Sub23 extends Linkable {
             int var7 = var3[var4][1 + var2] * (-var0 + 128) + var3[var4 - -1][var2 - -1] * var0 >> 7;
             return var6 * (128 + -var5) - -(var5 * var7) >> 7;
         } catch (RuntimeException var9) {
-         throw ClientErrorException.clientError(var9, "oj.A(" + var0 + ',' + var1 + ',' + var2 + ',' + (var3 != null?"{...}":"null") + ',' + var4 + ',' + var5 + ')');
+            throw ClientErrorException.clientError(var9, "oj.A(" + var0 + ',' + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ',' + var5 + ')');
         }
     }
 

Client/src/main/java/org/runite/client/Class3_Sub27.java

@@ -14,7 +14,7 @@ final class Class3_Sub27 extends Linkable {
     }
 
     final void method516() {
-      if(this.aHashTable_2564 == null) {
+        if (this.aHashTable_2564 == null) {
             this.aHashTable_2564 = new HashTable(16);
             int[] var1 = new int[16];
             int[] var2 = new int[16];
@@ -23,23 +23,23 @@ final class Class3_Sub27 extends Linkable {
             int var4 = var3.method1374();
 
             int var5;
-         for(var5 = 0; var5 < var4; ++var5) {
+            for (var5 = 0; var5 < var4; ++var5) {
                 var3.method1376(var5);
                 var3.method1377(var5);
                 var3.method1381(var5);
             }
 
-         while(true) {
+            while (true) {
                 var5 = var3.method1382();
                 int var6 = var3.anIntArray1114[var5];
 
-            while(var3.anIntArray1114[var5] == var6) {
+                while (var3.anIntArray1114[var5] == var6) {
                     var3.method1376(var5);
                     int var7 = var3.method1375(var5);
-               if(var7 == 1) {
+                    if (var7 == 1) {
                         var3.method1384();
                         var3.method1381(var5);
-                  if(var3.method1371()) {
+                        if (var3.method1371()) {
                             return;
                         }
                         break;
@@ -49,33 +49,33 @@ final class Class3_Sub27 extends Linkable {
                     int var9;
                     int var10;
                     int var11;
-               if(var8 == 176) {
+                    if (var8 == 176) {
                         var9 = var7 & 15;
                         var10 = var7 >> 8 & 127;
                         var11 = var7 >> 16 & 127;
-                  if(var10 == 0) {
+                        if (var10 == 0) {
                             var1[var9] = (var1[var9] & -2080769) + (var11 << 14);
                         }
 
-                  if(var10 == 32) {
+                        if (var10 == 32) {
                             var1[var9] = (var1[var9] & -16257) + (var11 << 7);
                         }
                     }
 
-               if(var8 == 192) {
+                    if (var8 == 192) {
                         var9 = var7 & 15;
                         var10 = var7 >> 8 & 127;
                         var2[var9] = var1[var9] + var10;
                     }
 
-               if(var8 == 144) {
+                    if (var8 == 144) {
                         var9 = var7 & 15;
                         var10 = var7 >> 8 & 127;
                         var11 = var7 >> 16 & 127;
-                  if(var11 > 0) {
+                        if (var11 > 0) {
                             int var12 = var2[var9];
-                     Class3_Sub6 var13 = (Class3_Sub6)this.aHashTable_2564.get(var12);
+                            Class3_Sub6 var13 = (Class3_Sub6) this.aHashTable_2564.get(var12);
-                     if(var13 == null) {
+                            if (var13 == null) {
                                 var13 = new Class3_Sub6(new byte[128]);
                                 this.aHashTable_2564.put(var12, var13);
                             }
@@ -93,15 +93,15 @@ final class Class3_Sub27 extends Linkable {
 
     static Class3_Sub27 method517(CacheIndex var0, int var1, int var2) {
         byte[] var3 = var0.getFile(var1, var2);
-      return var3 == null?null:new Class3_Sub27(new DataBuffer(var3));
+        return var3 == null ? null : new Class3_Sub27(new DataBuffer(var3));
     }
 
-   private Class3_Sub27(DataBuffer var1) {
+    private Class3_Sub27(DataBuffer buffer) {
-      var1.index = var1.buffer.length - 3;
+        buffer.index = buffer.buffer.length - 3;
-      int var2 = var1.readUnsignedByte();
+        int var2 = buffer.readUnsignedByte();
-      int var3 = var1.readUnsignedShort();
+        int var3 = buffer.readUnsignedShort();
         int var4 = 14 + var2 * 10;
-      var1.index = 0;
+        buffer.index = 0;
         int var5 = 0;
         int var6 = 0;
         int var7 = 0;
@@ -114,37 +114,37 @@ final class Class3_Sub27 extends Linkable {
 
         int var14;
         int var15;
-      while(var13 < var2) {
+        while (var13 < var2) {
             var14 = -1;
 
-         while(true) {
+            while (true) {
-            var15 = var1.readUnsignedByte();
+                var15 = buffer.readUnsignedByte();
-            if(var15 != var14) {
+                if (var15 != var14) {
                     ++var4;
                 }
 
                 var14 = var15 & 15;
-            if(var15 == 7) {
+                if (var15 == 7) {
                     ++var13;
                     break;
                 }
 
-            if(var15 == 23) {
+                if (var15 == 23) {
                     ++var5;
-            } else if(var14 == 0) {
+                } else if (var14 == 0) {
                     ++var7;
-            } else if(var14 == 1) {
+                } else if (var14 == 1) {
                     ++var8;
-            } else if(var14 == 2) {
+                } else if (var14 == 2) {
                     ++var6;
-            } else if(var14 == 3) {
+                } else if (var14 == 3) {
                     ++var9;
-            } else if(var14 == 4) {
+                } else if (var14 == 4) {
                     ++var10;
-            } else if(var14 == 5) {
+                } else if (var14 == 5) {
                     ++var11;
                 } else {
-               if(var14 != 6) {
+                    if (var14 != 6) {
                         throw new RuntimeException();
                     }
 
@@ -156,15 +156,15 @@ final class Class3_Sub27 extends Linkable {
         var4 += 5 * var5;
         var4 += 2 * (var7 + var8 + var6 + var9 + var11);
         var4 += var10 + var12;
-      var13 = var1.index;
+        var13 = buffer.index;
         var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12;
 
-      for(var15 = 0; var15 < var14; ++var15) {
+        for (var15 = 0; var15 < var14; ++var15) {
-         var1.method741();
+            buffer.method741();
         }
 
-      var4 += var1.index - var13;
+        var4 += buffer.index - var13;
-      var15 = var1.index;
+        var15 = buffer.index;
         int var16 = 0;
         int var17 = 0;
         int var18 = 0;
@@ -180,9 +180,9 @@ final class Class3_Sub27 extends Linkable {
         int var28 = 0;
 
         int var29;
-      for(var29 = 0; var29 < var6; ++var29) {
+        for (var29 = 0; var29 < var6; ++var29) {
-         var28 = var28 + var1.readUnsignedByte() & 127;
+            var28 = var28 + buffer.readUnsignedByte() & 127;
-         if(var28 == 0 || var28 == 32) {
+            if (var28 == 0 || var28 == 32) {
                 ++var12;
             } else if (var28 == 1) {
                 ++var16;
@@ -212,56 +212,56 @@ final class Class3_Sub27 extends Linkable {
         }
 
         var29 = 0;
-      int var30 = var1.index;
+        int var30 = buffer.index;
-      var1.index += var26;
+        buffer.index += var26;
-      int var31 = var1.index;
+        int var31 = buffer.index;
-      var1.index += var11;
+        buffer.index += var11;
-      int var32 = var1.index;
+        int var32 = buffer.index;
-      var1.index += var10;
+        buffer.index += var10;
-      int var33 = var1.index;
+        int var33 = buffer.index;
-      var1.index += var9;
+        buffer.index += var9;
-      int var34 = var1.index;
+        int var34 = buffer.index;
-      var1.index += var16;
+        buffer.index += var16;
-      int var35 = var1.index;
+        int var35 = buffer.index;
-      var1.index += var18;
+        buffer.index += var18;
-      int var36 = var1.index;
+        int var36 = buffer.index;
-      var1.index += var20;
+        buffer.index += var20;
-      int var37 = var1.index;
+        int var37 = buffer.index;
-      var1.index += var7 + var8 + var11;
+        buffer.index += var7 + var8 + var11;
-      int var38 = var1.index;
+        int var38 = buffer.index;
-      var1.index += var7;
+        buffer.index += var7;
-      int var39 = var1.index;
+        int var39 = buffer.index;
-      var1.index += var27;
+        buffer.index += var27;
-      int var40 = var1.index;
+        int var40 = buffer.index;
-      var1.index += var8;
+        buffer.index += var8;
-      int var41 = var1.index;
+        int var41 = buffer.index;
-      var1.index += var17;
+        buffer.index += var17;
-      int var42 = var1.index;
+        int var42 = buffer.index;
-      var1.index += var19;
+        buffer.index += var19;
-      int var43 = var1.index;
+        int var43 = buffer.index;
-      var1.index += var21;
+        buffer.index += var21;
-      int var44 = var1.index;
+        int var44 = buffer.index;
-      var1.index += var12;
+        buffer.index += var12;
-      int var45 = var1.index;
+        int var45 = buffer.index;
-      var1.index += var9;
+        buffer.index += var9;
-      int var46 = var1.index;
+        int var46 = buffer.index;
-      var1.index += var22;
+        buffer.index += var22;
-      int var47 = var1.index;
+        int var47 = buffer.index;
-      var1.index += var23;
+        buffer.index += var23;
-      int var48 = var1.index;
+        int var48 = buffer.index;
-      var1.index += var24;
+        buffer.index += var24;
-      int var49 = var1.index;
+        int var49 = buffer.index;
-      var1.index += var25;
+        buffer.index += var25;
-      int var50 = var1.index;
+        int var50 = buffer.index;
-      var1.index += var5 * 3;
+        buffer.index += var5 * 3;
         this.aByteArray2565 = new byte[var4];
         DataBuffer var51 = new DataBuffer(this.aByteArray2565);
         var51.writeInt(1297377380);
         var51.writeInt(6);
-      var51.writeShort(var2 > 1?1:0);
+        var51.writeShort(var2 > 1 ? 1 : 0);
         var51.writeShort(var2);
         var51.writeShort(var3);
-      var1.index = var13;
+        buffer.index = var13;
         int var52 = 0;
         int var53 = 0;
         int var54 = 0;
@@ -273,20 +273,20 @@ final class Class3_Sub27 extends Linkable {
         var28 = 0;
         int var60 = 0;
 
-      while(var60 < var2) {
+        while (var60 < var2) {
             var51.writeInt(1297379947);
             var51.index += 4;
             int var61 = var51.index;
             int var62 = -1;
 
-         while(true) {
+            while (true) {
-            int var63 = var1.method741();
+                int var63 = buffer.method741();
                 var51.method771(var63);
-            int var64 = var1.buffer[var29++] & 0xFF;
+                int var64 = buffer.buffer[var29++] & 0xFF;
                 boolean var65 = var64 != var62;
                 var62 = var64 & 15;
-            if(var64 == 7) {
+                if (var64 == 7) {
-               if(var65) {
+                    if (var65) {
                         var51.writeByte(255);
                     }
 
@@ -297,110 +297,110 @@ final class Class3_Sub27 extends Linkable {
                     break;
                 }
 
-            if(var64 == 23) {
+                if (var64 == 23) {
-               if(var65) {
+                    if (var65) {
                         var51.writeByte(255);
                     }
 
                     var51.writeByte(81);
                     var51.writeByte(3);
-               var51.writeByte(var1.buffer[var50++]);
+                    var51.writeByte(buffer.buffer[var50++]);
-               var51.writeByte(var1.buffer[var50++]);
+                    var51.writeByte(buffer.buffer[var50++]);
-               var51.writeByte(var1.buffer[var50++]);
+                    var51.writeByte(buffer.buffer[var50++]);
                 } else {
                     var52 ^= var64 >> 4;
-               if(var62 == 0) {
+                    if (var62 == 0) {
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(144 + var52);
                         }
 
-                  var53 += var1.buffer[var37++];
+                        var53 += buffer.buffer[var37++];
-                  var54 += var1.buffer[var38++];
+                        var54 += buffer.buffer[var38++];
                         var51.writeByte(var53 & 127);
                         var51.writeByte(var54 & 127);
-               } else if(var62 == 1) {
+                    } else if (var62 == 1) {
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(128 + var52);
                         }
 
-                  var53 += var1.buffer[var37++];
+                        var53 += buffer.buffer[var37++];
-                  var55 += var1.buffer[var40++];
+                        var55 += buffer.buffer[var40++];
                         var51.writeByte(var53 & 127);
                         var51.writeByte(var55 & 127);
-               } else if(var62 == 2) {
+                    } else if (var62 == 2) {
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(176 + var52);
                         }
 
-                  var28 = var28 + var1.buffer[var15++] & 127;
+                        var28 = var28 + buffer.buffer[var15++] & 127;
                         var51.writeByte(var28);
                         byte var66;
-                  if(var28 == 0 || var28 == 32) {
+                        if (var28 == 0 || var28 == 32) {
-                     var66 = var1.buffer[var44++];
+                            var66 = buffer.buffer[var44++];
                         } else if (var28 == 1) {
-                     var66 = var1.buffer[var34++];
+                            var66 = buffer.buffer[var34++];
                         } else if (var28 == 33) {
-                     var66 = var1.buffer[var41++];
+                            var66 = buffer.buffer[var41++];
                         } else if (var28 == 7) {
-                     var66 = var1.buffer[var35++];
+                            var66 = buffer.buffer[var35++];
                         } else if (var28 == 39) {
-                     var66 = var1.buffer[var42++];
+                            var66 = buffer.buffer[var42++];
                         } else if (var28 == 10) {
-                     var66 = var1.buffer[var36++];
+                            var66 = buffer.buffer[var36++];
                         } else if (var28 == 42) {
-                     var66 = var1.buffer[var43++];
+                            var66 = buffer.buffer[var43++];
                         } else if (var28 == 99) {
-                     var66 = var1.buffer[var46++];
+                            var66 = buffer.buffer[var46++];
                         } else if (var28 == 98) {
-                     var66 = var1.buffer[var47++];
+                            var66 = buffer.buffer[var47++];
                         } else if (var28 == 101) {
-                     var66 = var1.buffer[var48++];
+                            var66 = buffer.buffer[var48++];
                         } else if (var28 == 100) {
-                     var66 = var1.buffer[var49++];
+                            var66 = buffer.buffer[var49++];
                         } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
-                     var66 = var1.buffer[var39++];
+                            var66 = buffer.buffer[var39++];
                         } else {
-                     var66 = var1.buffer[var30++];
+                            var66 = buffer.buffer[var30++];
                         }
 
                         int var67 = var66 + var59[var28];
                         var59[var28] = var67;
                         var51.writeByte(var67 & 127);
-               } else if(var62 == 3) {
+                    } else if (var62 == 3) {
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(224 + var52);
                         }
 
-                  var56 += var1.buffer[var45++];
+                        var56 += buffer.buffer[var45++];
-                  var56 += var1.buffer[var33++] << 7;
+                        var56 += buffer.buffer[var33++] << 7;
                         var51.writeByte(var56 & 127);
                         var51.writeByte(var56 >> 7 & 127);
-               } else if(var62 == 4) {
+                    } else if (var62 == 4) {
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(208 + var52);
                         }
 
-                  var57 += var1.buffer[var32++];
+                        var57 += buffer.buffer[var32++];
                         var51.writeByte(var57 & 127);
-               } else if(var62 == 5) {
+                    } else if (var62 == 5) {
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(160 + var52);
                         }
 
-                  var53 += var1.buffer[var37++];
+                        var53 += buffer.buffer[var37++];
-                  var58 += var1.buffer[var31++];
+                        var58 += buffer.buffer[var31++];
                         var51.writeByte(var53 & 127);
                         var51.writeByte(var58 & 127);
                     } else {
-                  if(var62 != 6) {
+                        if (var62 != 6) {
                             throw new RuntimeException();
                         }
 
-                  if(var65) {
+                        if (var65) {
                             var51.writeByte(192 + var52);
                         }
 
-                  var51.writeByte(var1.buffer[var44++]);
+                        var51.writeByte(buffer.buffer[var44++]);
                     }
                 }
             }

Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java

@@ -4,12 +4,10 @@ import org.rs09.client.Node;
 
 import java.awt.*;
 
-final class Class3_Sub28_Sub1 extends Node {
+public final class Class3_Sub28_Sub1 extends Node {
 
     static boolean aBoolean3531 = false;
     static Class3_Sub20 aClass3_Sub20_3532 = new Class3_Sub20(0, 0);
-    static Image anImage2695;
-    static FontMetrics aFontMetrics1822;
     int[] anIntArray3533;
     int[] anIntArray3534;
     int[] anIntArray3535;
@@ -57,37 +55,37 @@ final class Class3_Sub28_Sub1 extends Node {
         }
     }
 
-    private void method527(DataBuffer var1, int var3) {
+    private void method527(DataBuffer buffer, int var3) {
         try {
 
             if (var3 == 1) {
-                this.quickChatMenu = var1.readString();
+                this.quickChatMenu = buffer.readString();
             } else {
                 int var4;
                 int var5;
                 if (var3 == 2) {
-                    var4 = var1.readUnsignedByte();
+                    var4 = buffer.readUnsignedByte();
                     this.anIntArray3534 = new int[var4];
                     this.anIntArray3535 = new int[var4];
 
                     for (var5 = 0; var5 < var4; ++var5) {
-                        this.anIntArray3534[var5] = var1.readUnsignedShort();
+                        this.anIntArray3534[var5] = buffer.readUnsignedShort();
-                        this.anIntArray3535[var5] = TextureOperation29.method322(var1.readSignedByte());
+                        this.anIntArray3535[var5] = TextureOperation29.method322(buffer.readSignedByte());
                     }
                 } else if (var3 == 3) {
-                    var4 = var1.readUnsignedByte();
+                    var4 = buffer.readUnsignedByte();
                     this.anIntArray3540 = new int[var4];
                     this.anIntArray3533 = new int[var4];
 
                     for (var5 = 0; var5 < var4; ++var5) {
-                        this.anIntArray3540[var5] = var1.readUnsignedShort();
+                        this.anIntArray3540[var5] = buffer.readUnsignedShort();
-                        this.anIntArray3533[var5] = TextureOperation29.method322(var1.readSignedByte());
+                        this.anIntArray3533[var5] = TextureOperation29.method322(buffer.readSignedByte());
                     }
                 }
             }
 
         } catch (RuntimeException var6) {
-            throw ClientErrorException.clientError(var6, "bc.E(" + (var1 != null ? "{...}" : "null") + ',' + 0 + ',' + var3 + ')');
+            throw ClientErrorException.clientError(var6, "bc.E(" + (buffer != null ? "{...}" : "null") + ',' + 0 + ',' + var3 + ')');
         }
     }
 
@@ -107,121 +105,19 @@ final class Class3_Sub28_Sub1 extends Node {
         }
     }
 
-    final void method530(DataBuffer var1) {
+    final void method530(DataBuffer buffer) {
         try {
 
             while (true) {
-                int var3 = var1.readUnsignedByte();
+                int opcode = buffer.readUnsignedByte();
-                if (var3 == 0) {
+                if (opcode == 0) {
                     return;
                 }
 
-                this.method527(var1, var3);
+                this.method527(buffer, opcode);
             }
         } catch (RuntimeException var4) {
-            throw ClientErrorException.clientError(var4, "bc.D(" + (var1 != null ? "{...}" : "null") + ',' + (byte) 116 + ')');
+            throw ClientErrorException.clientError(var4, "bc.D(" + (buffer != null ? "{...}" : "null") + ',' + (byte) 116 + ')');
-        }
-    }
-
-    static RSString method531() {
-        RSString var1;
-        if (Class164_Sub1.anInt3012 == 1 && Unsorted.menuOptionCount < 2) {
-            var1 = RSString.stringCombiner(new RSString[]{TextCore.HasUse, TextCore.Spacer, RenderAnimationDefinition.aClass94_378, TextCore.aClass94_1724});
-        } else if (GameObject.aBoolean1837 && 2 > Unsorted.menuOptionCount) {
-            var1 = RSString.stringCombiner(new RSString[]{Class3_Sub28_Sub9.aClass94_3621, TextCore.Spacer, TextCore.aClass94_676, TextCore.aClass94_1724});
-
-        } else if (ClientCommands.shiftClickEnabled && ObjectDefinition.aBooleanArray1490[81] && Unsorted.menuOptionCount > 2 && !ObjectDefinition.aBooleanArray1490[82]) {
-            for (counter = 2; counter < Unsorted.menuOptionCount; counter++) {
-                RSString option = (Unsorted.method802(Unsorted.menuOptionCount - counter));
-                if (option.toString().contains("Drop") || option.toString().contains("Release")) {
-                    ClientCommands.canDrop = true;
-                    dropAction = counter;
-                    break;
-                } else {
-                    ClientCommands.canDrop = false;
-                }
-            }
-            if (ClientCommands.canDrop) {
-                var1 = Unsorted.method802(Unsorted.menuOptionCount - dropAction);
-            } else {
-                var1 = Unsorted.method802(Unsorted.menuOptionCount - 1);
-            }
-        } else {
-            var1 = Unsorted.method802(Unsorted.menuOptionCount - 1);
-        }
-
-        if (Unsorted.menuOptionCount > 2) {
-            var1 = RSString.stringCombiner(new RSString[]{var1, Class1.aClass94_58, RSString.stringAnimator(Unsorted.menuOptionCount - 2), TextCore.HasMoreOptions});
-        }
-        return var1;
-    }
-
-    static void method532(int var0) {
-        try {
-            Class3_Sub25 var2 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var0);
-            if (null != var2) {
-                var2.unlink();
-            }
-        } catch (RuntimeException var3) {
-            throw ClientErrorException.clientError(var3, "bc.A(" + var0 + ',' + -28236 + ')');
-        }
-    }
-
-    static void updateLoadingBar(Color var0, boolean var2, RSString var3, int var4) {
-        try {
-            try {
-                Graphics var5 = GameShell.canvas.getGraphics();
-                aFontMetrics1822 = GameShell.canvas.getFontMetrics(TextCore.Helvetica);
-                if (var2) {
-                    var5.setColor(Color.black);
-                    var5.fillRect(0, 0, Class23.canvasWidth, Class140_Sub7.canvasHeight);
-                }
-
-                if (null == var0) {
-                    var0 = ColorCore.loadingbarcolor;
-                }
-
-                try {
-                    if (null == anImage2695) {
-                        anImage2695 = GameShell.canvas.createImage(304, 34);
-                    }
-
-                    Graphics var6 = anImage2695.getGraphics();
-                    var6.setColor(var0);
-                    var6.drawRect(0, 0, 303, 33);
-                    var6.fillRect(2, 2, var4 * 3, 30);
-                    var6.setColor(Color.black);
-                    var6.drawRect(1, 1, 301, 31);
-                    var6.fillRect(3 * var4 + 2, 2, -(3 * var4) + 300, 30);
-                    var6.setFont(TextCore.Helvetica);
-                    var6.setColor(Color.white);
-                    var3.drawString(var6, 22, (-var3.method1575(aFontMetrics1822) + 304) / 2);
-                    var5.drawImage(anImage2695, Class23.canvasWidth / 2 - 152, -18 + Class140_Sub7.canvasHeight / 2, null);
-                } catch (Exception var9) {
-                    int var7 = -152 + Class23.canvasWidth / 2;
-                    int var8 = -18 + Class140_Sub7.canvasHeight / 2;
-                    var5.setColor(var0);
-                    var5.drawRect(var7, var8, 303, 33);
-                    var5.fillRect(var7 + 2, 2 + var8, 3 * var4, 30);
-                    var5.setColor(Color.black);
-                    var5.drawRect(1 + var7, var8 - -1, 301, 31);
-                    var5.fillRect(3 * var4 + (var7 - -2), 2 + var8, 300 - var4 * 3, 30);
-                    var5.setFont(TextCore.Helvetica);
-                    var5.setColor(Color.white);
-                    var3.drawString(var5, 22 + var8, var7 + (-var3.method1575(aFontMetrics1822) + 304) / 2);
-                }
-
-                if (Class167.aClass94_2083 != null) {
-                    var5.setFont(TextCore.Helvetica);
-                    var5.setColor(Color.white);
-                    Class167.aClass94_2083.drawString(var5, Class140_Sub7.canvasHeight / 2 - 26, Class23.canvasWidth / 2 - Class167.aClass94_2083.method1575(aFontMetrics1822) / 2);
-                }
-            } catch (Exception var10) {
-                GameShell.canvas.repaint();
-            }
-
-        } catch (RuntimeException var11) {
-            throw ClientErrorException.clientError(var11, "bc.C(" + (var0 != null ? "{...}" : "null") + ',' + false + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ')');
         }
     }
 

Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2.java

@@ -1285,7 +1285,7 @@ public class Class3_Sub28_Sub16_Sub2 extends AbstractSprite {
 
    }
 
-   void method639(int var1, int var2, int var3, int var4) {
+   public void method639(int var1, int var2, int var3, int var4) {
       if(var3 > 0 && var4 > 0) {
          int var5 = this.width;
          int var6 = this.height;

Client/src/main/java/org/runite/client/Class3_Sub28_Sub16_Sub2_Sub1.java

@@ -768,7 +768,7 @@ public final class Class3_Sub28_Sub16_Sub2_Sub1 extends Class3_Sub28_Sub16_Sub2
 
    }
 
-   final void method639(int var1, int var2, int var3, int var4) {
+   public final void method639(int var1, int var2, int var3, int var4) {
       if(var3 > 0 && var4 > 0) {
          int var5 = this.width;
          int var6 = this.height;

Client/src/main/java/org/runite/client/Class40.java

@@ -3,13 +3,13 @@ package org.runite.client;
 import org.rs09.client.config.GameConfig;
 import org.runite.client.drawcalls.LoadingBox;
 
-final class Class40 {
+public final class Class40 {
 
     static RSString aClass94_672 = RSString.parse("null");
     static int[] anIntArray675 = new int[]{16, 32, 64, 128};
     static int anInt677 = 0;
     static CacheIndex aClass153_679;
-    static AbstractSprite aAbstractSprite_680;
+    public static AbstractSprite aAbstractSprite_680;
     static byte[][] aByteArrayArray3669;
     static byte[][] aByteArrayArray3057;
     static int anInt3293 = 0;
@@ -48,14 +48,6 @@ final class Class40 {
         }
     }
 
-//   static void method1044() {
-//      try {
-//         CS2Script.aReferenceCache_2450.clearSoftReferences();
-//      } catch (RuntimeException var2) {
-//         throw ClientErrorException.clientError(var2, "gd.E(" + ')');
-//      }
-//   }
-
     static void method1045() {
         try {
 
@@ -247,7 +239,7 @@ final class Class40 {
 
                     TextureOperation13.method313((byte) 90);
                     Class163_Sub1.method2210(true);
-                    Class158_Sub1.method2189(AtmosphereParser.aClass91Array1182, false, 66);
+                    method2189(AtmosphereParser.aClass91Array1182, false, 66);
                     if (HDToolKit.highDetail) {
                         Class68.method1270();
                     }
@@ -285,7 +277,7 @@ final class Class40 {
 
                         TextureOperation13.method313((byte) 102);
                         Class163_Sub1.method2210(true);
-                        Class158_Sub1.method2189(AtmosphereParser.aClass91Array1182, true, 112);
+                        method2189(AtmosphereParser.aClass91Array1182, true, 112);
                         Class163_Sub1.method2210(true);
                         Class56.method1188();
                         Class167.method2264(false);
@@ -371,4 +363,617 @@ final class Class40 {
             throw ClientErrorException.clientError(var2, "rl.B(" + 7759444 + ')');
         }
     }
+
+    static void method2189(Class91[] var0, boolean var1, int var2) {
+        try {
+            int var4;
+            int var5;
+            if (!var1) {
+                for (var4 = 0; var4 < 4; ++var4) {
+                    for (var5 = 0; var5 < 104; ++var5) {
+                        for (int var6 = 0; var6 < 104; ++var6) {
+                            if ((1 & Unsorted.aByteArrayArrayArray113[var4][var5][var6]) == 1) {
+                                int var7 = var4;
+                                if ((2 & Unsorted.aByteArrayArrayArray113[1][var5][var6]) == 2) {
+                                    var7 = var4 - 1;
+                                }
+
+                                if (var7 >= 0) {
+                                    var0[var7].method1497(var6, var5);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Class158_Sub1.anInt1463 += (int) (Math.random() * 5.0D) - 2;
+                if (Class158_Sub1.anInt1463 < -16) {
+                    Class158_Sub1.anInt1463 = -16;
+                }
+
+                if (Class158_Sub1.anInt1463 > 16) {
+                    Class158_Sub1.anInt1463 = 16;
+                }
+
+                Class158_Sub1.anInt3158 += (int) (Math.random() * 5.0D) - 2;
+                if (-8 > Class158_Sub1.anInt3158) {
+                    Class158_Sub1.anInt3158 = -8;
+                }
+
+                if (Class158_Sub1.anInt3158 > 8) {
+                    Class158_Sub1.anInt3158 = 8;
+                }
+            }
+
+            byte var3;
+            if (var1) {
+                var3 = 1;
+            } else {
+                var3 = 4;
+            }
+
+            var4 = Class158_Sub1.anInt3158 >> 2 << 10;
+            int[][] var34 = new int[104][104];
+            int[][] var35 = new int[104][104];
+            var5 = Class158_Sub1.anInt1463 >> 1;
+
+            int var8;
+            int var10;
+            int var11;
+            int var13;
+            int var14;
+            int var15;
+            int var16;
+            int var19;
+            int var18;
+            int var20;
+            int var37;
+            int var44;
+            for (var8 = 0; var3 > var8; ++var8) {
+                byte[][] var9 = Class67.aByteArrayArrayArray1014[var8];
+                int var21;
+                int var23;
+                int var22;
+                int var24;
+                if (HDToolKit.highDetail) {
+                    if (Class106.aBoolean1441) {
+                        for (var10 = 1; var10 < 103; ++var10) {
+                            for (var11 = 1; var11 < 103; ++var11) {
+                                var13 = (var9[1 + var11][var10] >> 3) + (var9[-1 + var11][var10] >> 2) - -(var9[var11][-1 + var10] >> 2) - -(var9[var11][1 + var10] >> 3) - -(var9[var11][var10] >> 1);
+                                byte var12 = 74;
+                                var35[var11][var10] = -var13 + var12;
+                            }
+                        }
+                    } else {
+                        var10 = (int) Class92.light0Position[0];
+                        var11 = (int) Class92.light0Position[1];
+                        var37 = (int) Class92.light0Position[2];
+                        var13 = (int) Math.sqrt(var11 * var11 + (var10 * var10 - -(var37 * var37)));
+                        var14 = 1024 * var13 >> 8;
+
+                        for (var15 = 1; var15 < 103; ++var15) {
+                            for (var16 = 1; var16 < 103; ++var16) {
+                                byte var17 = 96;
+                                var18 = Class44.anIntArrayArrayArray723[var8][var16 - -1][var15] - Class44.anIntArrayArrayArray723[var8][-1 + var16][var15];
+                                var19 = Class44.anIntArrayArrayArray723[var8][var16][var15 + 1] - Class44.anIntArrayArrayArray723[var8][var16][-1 + var15];
+                                var20 = (int) Math.sqrt(var18 * var18 + 65536 + var19 * var19);
+                                var21 = (var18 << 8) / var20;
+                                var24 = (var9[var16][1 + var15] >> 3) + (var9[var16][var15 - 1] >> 2) + ((var9[var16 - 1][var15] >> 2) + (var9[var16 + 1][var15] >> 3) - -(var9[var16][var15] >> 1));
+                                var22 = -65536 / var20;
+                                var23 = (var19 << 8) / var20;
+                                var44 = var17 + (var37 * var23 + (var10 * var21 - -(var22 * var11))) / var14;
+                                var35[var16][var15] = var44 + -((int) ((float) var24 * 1.7F));
+                            }
+                        }
+                    }
+                } else {
+                    var10 = (int) Math.sqrt(5100.0D);
+                    var11 = 768 * var10 >> 8;
+
+                    for (var37 = 1; var37 < 103; ++var37) {
+                        for (var13 = 1; 103 > var13; ++var13) {
+                            var16 = -Class44.anIntArrayArrayArray723[var8][var13][-1 + var37] + Class44.anIntArrayArrayArray723[var8][var13][var37 + 1];
+                            byte var41 = 74;
+                            var15 = -Class44.anIntArrayArrayArray723[var8][var13 + -1][var37] + Class44.anIntArrayArrayArray723[var8][var13 - -1][var37];
+                            var44 = (int) Math.sqrt(var15 * var15 - -65536 - -(var16 * var16));
+                            var20 = (var16 << 8) / var44;
+                            var19 = -65536 / var44;
+                            var18 = (var15 << 8) / var44;
+                            var21 = (var9[var13][var37] >> 1) + (var9[var13][-1 + var37] >> 2) + (var9[var13 - -1][var37] >> 3) + ((var9[var13 - 1][var37] >> 2) - -(var9[var13][var37 + 1] >> 3));
+                            var14 = var41 + (var20 * -50 + var18 * -50 - -(var19 * -10)) / var11;
+                            var35[var13][var37] = var14 - var21;
+                        }
+                    }
+                }
+
+                for (var10 = 0; 104 > var10; ++var10) {
+                    Class129.anIntArray1695[var10] = 0;
+                    Unsorted.anIntArray1138[var10] = 0;
+                    Class3_Sub31.anIntArray2606[var10] = 0;
+                    MouseListeningClass.anIntArray1920[var10] = 0;
+                    Unsorted.anIntArray2469[var10] = 0;
+                }
+
+                for (var10 = -5; var10 < 104; ++var10) {
+                    for (var11 = 0; 104 > var11; ++var11) {
+                        var37 = var10 - -5;
+                        if (var37 < 104) {
+                            var13 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var37][var11];
+                            if (var13 > 0) {
+                                MapUnderlayColorDefinition var39 = MapUnderlayColorDefinition.method629(-1 + var13);
+                                Class129.anIntArray1695[var11] += var39.anInt1408;
+                                Unsorted.anIntArray1138[var11] += var39.anInt1406;
+                                Class3_Sub31.anIntArray2606[var11] += var39.anInt1417;
+                                MouseListeningClass.anIntArray1920[var11] += var39.anInt1418;
+                                ++Unsorted.anIntArray2469[var11];
+                            }
+                        }
+
+                        var13 = -5 + var10;
+                        if (0 <= var13) {
+                            var14 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var13][var11];
+                            if (var14 > 0) {
+                                MapUnderlayColorDefinition var42 = MapUnderlayColorDefinition.method629(-1 + var14);
+                                Class129.anIntArray1695[var11] -= var42.anInt1408;
+                                Unsorted.anIntArray1138[var11] -= var42.anInt1406;
+                                Class3_Sub31.anIntArray2606[var11] -= var42.anInt1417;
+                                MouseListeningClass.anIntArray1920[var11] -= var42.anInt1418;
+                                --Unsorted.anIntArray2469[var11];
+                            }
+                        }
+                    }
+
+                    if (var10 >= 0) {
+                        var11 = 0;
+                        var13 = 0;
+                        var37 = 0;
+                        var14 = 0;
+                        var15 = 0;
+
+                        for (var16 = -5; var16 < 104; ++var16) {
+                            var44 = var16 - -5;
+                            if (104 > var44) {
+                                var37 += Unsorted.anIntArray1138[var44];
+                                var15 += Unsorted.anIntArray2469[var44];
+                                var11 += Class129.anIntArray1695[var44];
+                                var14 += MouseListeningClass.anIntArray1920[var44];
+                                var13 += Class3_Sub31.anIntArray2606[var44];
+                            }
+
+                            var18 = var16 + -5;
+                            if (var18 >= 0) {
+                                var37 -= Unsorted.anIntArray1138[var18];
+                                var14 -= MouseListeningClass.anIntArray1920[var18];
+                                var11 -= Class129.anIntArray1695[var18];
+                                var15 -= Unsorted.anIntArray2469[var18];
+                                var13 -= Class3_Sub31.anIntArray2606[var18];
+                            }
+
+                            if (0 <= var16 && var15 > 0 && var14 != 0) {
+                                var34[var10][var16] = Class3_Sub8.method129(var13 / var15, var37 / var15, 256 * var11 / var14);
+                            }
+                        }
+                    }
+                }
+
+                for (var10 = 1; var10 < 103; ++var10) {
+                    label754:
+                    for (var11 = 1; var11 < 103; ++var11) {
+                        if (var1 || NPC.method1986(66) || (2 & Unsorted.aByteArrayArrayArray113[0][var10][var11]) != 0 || (16 & Unsorted.aByteArrayArrayArray113[var8][var10][var11]) == 0 && PacketParser.method823(var11, var10, -87, var8) == Class140_Sub3.anInt2745) {
+                            if (var8 < Class85.anInt1174) {
+                                Class85.anInt1174 = var8;
+                            }
+
+                            var37 = 255 & TextureOperation36.aByteArrayArrayArray3430[var8][var10][var11];
+                            var13 = Class158_Sub1.aByteArrayArrayArray1828[var8][var10][var11] & 0xFF;
+                            if (0 < var37 || var13 > 0) {
+                                var15 = Class44.anIntArrayArrayArray723[var8][var10 + 1][var11];
+                                var14 = Class44.anIntArrayArrayArray723[var8][var10][var11];
+                                var44 = Class44.anIntArrayArrayArray723[var8][var10][1 + var11];
+                                var16 = Class44.anIntArrayArrayArray723[var8][1 + var10][var11 + 1];
+                                if (0 < var8) {
+                                    boolean var47 = true;
+                                    if (var37 == 0 && Unsorted.aByteArrayArrayArray1328[var8][var10][var11] != 0) {
+                                        var47 = false;
+                                    }
+
+                                    if (var13 > 0 && !Class168.method350(var13 + -1).aBoolean2102) {
+                                        var47 = false;
+                                    }
+
+                                    if (var47 && var14 == var15 && var16 == var14 && var14 == var44) {
+                                        Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11] = TextureOperation3.bitwiseOr(Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var11], 4);
+                                    }
+                                }
+
+                                if (var37 <= 0) {
+                                    var18 = -1;
+                                    var19 = 0;
+                                } else {
+                                    var18 = var34[var10][var11];
+                                    var20 = (var18 & 127) + var5;
+                                    if (var20 >= 0) {
+                                        if (var20 > 127) {
+                                            var20 = 127;
+                                        }
+                                    } else {
+                                        var20 = 0;
+                                    }
+
+                                    var21 = (896 & var18) + (var18 + var4 & '\ufc00') + var20;
+                                    var19 = Class51.anIntArray834[Unsorted.method1100(96, var21)];
+                                }
+
+                                var20 = var35[var10][var11];
+                                var23 = var35[var10][var11 + 1];
+                                var21 = var35[1 + var10][var11];
+                                var22 = var35[var10 - -1][var11 - -1];
+                                if (var13 == 0) {
+                                    method1629(var8, var10, var11, 0, 0, -1, var14, var15, var16, var44, Unsorted.method1100(var20, var18), Unsorted.method1100(var21, var18), Unsorted.method1100(var22, var18), Unsorted.method1100(var23, var18), 0, 0, 0, 0, var19, 0);
+                                    if (HDToolKit.highDetail && var8 > 0 && var18 != -1 && MapUnderlayColorDefinition.method629(-1 + var37).aBoolean1411) {
+                                        Class141.method2037(0, 0, true, false, var10, var11, var14 - Class44.anIntArrayArrayArray723[0][var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11] + var15, var16 - Class44.anIntArrayArrayArray723[0][1 + var10][1 + var11], var44 - Class44.anIntArrayArrayArray723[0][var10][1 + var11]);
+                                    }
+
+                                    if (HDToolKit.highDetail && !var1 && TextureOperation16.anIntArrayArray3115 != null && 0 == var8) {
+                                        for (var24 = var10 + -1; var10 - -1 >= var24; ++var24) {
+                                            for (int var52 = -1 + var11; var52 <= 1 + var11; ++var52) {
+                                                if ((var24 != var10 || var11 != var52) && var24 >= 0 && var24 < 104 && 0 <= var52 && var52 < 104) {
+                                                    int var54 = Class158_Sub1.aByteArrayArrayArray1828[var8][var24][var52] & 0xFF;
+                                                    if (var54 != 0) {
+                                                        Class168 var53 = Class168.method350(-1 + var54);
+                                                        if (var53.anInt2095 != -1 && 4 == Class51.anInterface2_838.method18(var53.anInt2095, 255)) {
+                                                            TextureOperation16.anIntArrayArray3115[var10][var11] = var53.anInt2094 + (var53.anInt2101 << 24);
+                                                            continue label754;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    var24 = 1 + Unsorted.aByteArrayArrayArray1328[var8][var10][var11];
+                                    byte var25 = PacketParser.aByteArrayArrayArray81[var8][var10][var11];
+                                    Class168 var26 = Class168.method350(var13 + -1);
+                                    int var27;
+                                    int var29;
+                                    int var28;
+                                    if (HDToolKit.highDetail && !var1 && null != TextureOperation16.anIntArrayArray3115 && 0 == var8) {
+                                        if (-1 != var26.anInt2095 && Class51.anInterface2_838.method18(var26.anInt2095, 255) == 4) {
+                                            TextureOperation16.anIntArrayArray3115[var10][var11] = (var26.anInt2101 << 24) + var26.anInt2094;
+                                        } else {
+                                            label722:
+                                            for (var27 = var10 + -1; 1 + var10 >= var27; ++var27) {
+                                                for (var28 = var11 + -1; 1 + var11 >= var28; ++var28) {
+                                                    if ((var27 != var10 || var11 != var28) && var27 >= 0 && var27 < 104 && var28 >= 0 && var28 < 104) {
+                                                        var29 = Class158_Sub1.aByteArrayArrayArray1828[var8][var27][var28] & 0xFF;
+                                                        if (var29 != 0) {
+                                                            Class168 var30 = Class168.method350(-1 + var29);
+                                                            if (var30.anInt2095 != -1 && Class51.anInterface2_838.method18(var30.anInt2095, 255) == 4) {
+                                                                TextureOperation16.anIntArrayArray3115[var10][var11] = var30.anInt2094 + (var30.anInt2101 << 24);
+                                                                break label722;
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+
+                                    var27 = var26.anInt2095;
+                                    if (0 <= var27 && !Class51.anInterface2_838.method17(var27, 101)) {
+                                        var27 = -1;
+                                    }
+
+                                    int var31;
+                                    int var55;
+                                    if (var27 < 0) {
+                                        if (var26.anInt2103 == -1) {
+                                            var28 = -2;
+                                            var29 = 0;
+                                        } else {
+                                            var28 = var26.anInt2103;
+                                            var55 = var5 + (var28 & 127);
+                                            if (var55 >= 0) {
+                                                if (var55 > 127) {
+                                                    var55 = 127;
+                                                }
+                                            } else {
+                                                var55 = 0;
+                                            }
+
+                                            var31 = (var28 & 896) + (('\ufc00' & var28 + var4) - -var55);
+                                            var29 = Class51.anIntArray834[LinkableRSString.method729((byte) -85, var31, 96)];
+                                        }
+                                    } else {
+                                        var28 = -1;
+                                        var29 = Class51.anIntArray834[LinkableRSString.method729((byte) -126, Class51.anInterface2_838.method15(var27, 65535), 96)];
+                                    }
+
+                                    if (var26.anInt2098 >= 0) {
+                                        var55 = var26.anInt2098;
+                                        var31 = var5 + (var55 & 127);
+                                        if (var31 >= 0) {
+                                            if (127 < var31) {
+                                                var31 = 127;
+                                            }
+                                        } else {
+                                            var31 = 0;
+                                        }
+
+                                        int var32 = (896 & var55) + (('\ufc00' & var55 + var4) - -var31);
+                                        var29 = Class51.anIntArray834[LinkableRSString.method729((byte) -101, var32, 96)];
+                                    }
+
+                                    method1629(var8, var10, var11, var24, var25, var27, var14, var15, var16, var44, Unsorted.method1100(var20, var18), Unsorted.method1100(var21, var18), Unsorted.method1100(var22, var18), Unsorted.method1100(var23, var18), LinkableRSString.method729((byte) -72, var28, var20), LinkableRSString.method729((byte) -107, var28, var21), LinkableRSString.method729((byte) -82, var28, var22), LinkableRSString.method729((byte) -93, var28, var23), var19, var29);
+                                    if (HDToolKit.highDetail && var8 > 0) {
+                                        Class141.method2037(var24, var25, var28 == -2 || !var26.aBoolean2093, -1 == var18 || !MapUnderlayColorDefinition.method629(-1 + var37).aBoolean1411, var10, var11, -Class44.anIntArrayArrayArray723[0][var10][var11] + var14, var15 - Class44.anIntArrayArrayArray723[0][1 + var10][var11], -Class44.anIntArrayArrayArray723[0][1 + var10][var11 + 1] + var16, -Class44.anIntArrayArrayArray723[0][var10][1 + var11] + var44);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (HDToolKit.highDetail) {
+                    float[][] var38 = new float[105][105];
+                    int[][] var45 = Class44.anIntArrayArrayArray723[var8];
+                    float[][] var40 = new float[105][105];
+                    float[][] var43 = new float[105][105];
+
+                    for (var14 = 1; var14 <= 103; ++var14) {
+                        for (var15 = 1; var15 <= 103; ++var15) {
+                            var44 = var45[var15][var14 - -1] + -var45[var15][-1 + var14];
+                            var16 = -var45[var15 - 1][var14] + var45[var15 + 1][var14];
+                            float var51 = (float) Math.sqrt(var16 * var16 - -65536 - -(var44 * var44));
+                            var38[var15][var14] = (float) var16 / var51;
+                            var40[var15][var14] = -256.0F / var51;
+                            var43[var15][var14] = (float) var44 / var51;
+                        }
+                    }
+
+                    Class3_Sub11[] var50;
+                    if (var1) {
+                        var50 = TextureOperation7.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], var35, var40, TextureOperation16.anIntArrayArray3115, Class158_Sub1.aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], Class58.anIntArrayArrayArray914[0]);
+                        LinkedList.method1213(var8, var50);
+                    } else {
+                        var50 = TextureOperation7.method298(Unsorted.aByteArrayArrayArray113, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], var35, var40, null, Class158_Sub1.aByteArrayArrayArray1828[var8], PacketParser.aByteArrayArrayArray81[var8], var38, var8, var43, var34, Class44.anIntArrayArrayArray723[var8], null);
+                        Class3_Sub11[] var46 = Class1.method70(var40, var38, Class44.anIntArrayArrayArray723[var8], var8, var43, PacketParser.aByteArrayArrayArray81[var8], var35, Unsorted.aByteArrayArrayArray1328[var8], TextureOperation36.aByteArrayArrayArray3430[var8], Class158_Sub1.aByteArrayArrayArray1828[var8], Unsorted.aByteArrayArrayArray113);
+                        Class3_Sub11[] var49 = new Class3_Sub11[var50.length - -var46.length];
+
+                        for (var44 = 0; var44 < var50.length; ++var44) {
+                            var49[var44] = var50[var44];
+                        }
+
+                        for (var44 = 0; var44 < var46.length; ++var44) {
+                            var49[var50.length + var44] = var46[var44];
+                        }
+
+                        LinkedList.method1213(var8, var49);
+                        Class129.method1769(var43, TextureOperation36.aByteArrayArrayArray3430[var8], PacketParser.aByteArrayArrayArray81[var8], Class68.aClass43Array1021, var8, Class68.anInt1032, var40, Unsorted.aByteArrayArrayArray1328[var8], Class158_Sub1.aByteArrayArrayArray1828[var8], Class44.anIntArrayArrayArray723[var8], var38);
+                    }
+                }
+
+                TextureOperation36.aByteArrayArrayArray3430[var8] = null;
+                Class158_Sub1.aByteArrayArrayArray1828[var8] = null;
+                Unsorted.aByteArrayArrayArray1328[var8] = null;
+                PacketParser.aByteArrayArrayArray81[var8] = null;
+                Class67.aByteArrayArrayArray1014[var8] = null;
+            }
+
+            if (var2 <= 26) {
+                method2187(86);
+            }
+
+            Class128.method1764();
+            if (!var1) {
+                int var36;
+                for (var8 = 0; 104 > var8; ++var8) {
+                    for (var36 = 0; var36 < 104; ++var36) {
+                        if ((Unsorted.aByteArrayArrayArray113[1][var8][var36] & 2) == 2) {
+                            Class3_Sub28_Sub18.method709(var8, var36);
+                        }
+                    }
+                }
+
+                for (var8 = 0; 4 > var8; ++var8) {
+                    for (var36 = 0; var36 <= 104; ++var36) {
+                        for (var10 = 0; var10 <= 104; ++var10) {
+                            short var48;
+                            if ((Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var36] & 1) != 0) {
+                                var14 = var8;
+
+                                for (var11 = var36; var11 > 0 && (1 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][-1 + var11]) != 0; --var11) {
+                                }
+
+                                var13 = var8;
+
+                                for (var37 = var36; var37 < 104 && (1 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var37 - -1]) != 0; ++var37) {
+                                }
+
+                                label453:
+                                while (var13 > 0) {
+                                    for (var15 = var11; var15 <= var37; ++var15) {
+                                        if ((Class38_Sub1.anIntArrayArrayArray2609[var13 + -1][var10][var15] & 1) == 0) {
+                                            break label453;
+                                        }
+                                    }
+
+                                    --var13;
+                                }
+
+                                label464:
+                                while (var14 < 3) {
+                                    for (var15 = var11; var15 <= var37; ++var15) {
+                                        if ((1 & Class38_Sub1.anIntArrayArrayArray2609[var14 + 1][var10][var15]) == 0) {
+                                            break label464;
+                                        }
+                                    }
+
+                                    ++var14;
+                                }
+
+                                var15 = (var14 - (-1 + var13)) * (-var11 + (var37 - -1));
+                                if (var15 >= 8) {
+                                    var48 = 240;
+                                    var44 = -var48 + Class44.anIntArrayArrayArray723[var14][var10][var11];
+                                    var18 = Class44.anIntArrayArrayArray723[var13][var10][var11];
+                                    Class167.method2263(1, 128 * var10, 128 * var10, 128 * var11, var37 * 128 + 128, var44, var18);
+
+                                    for (var19 = var13; var19 <= var14; ++var19) {
+                                        for (var20 = var11; var37 >= var20; ++var20) {
+                                            Class38_Sub1.anIntArrayArrayArray2609[var19][var10][var20] = Unsorted.bitwiseAnd(Class38_Sub1.anIntArrayArrayArray2609[var19][var10][var20], -2);
+                                        }
+                                    }
+                                }
+                            }
+
+                            if ((2 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var36]) != 0) {
+                                for (var11 = var10; 0 < var11 && (Class38_Sub1.anIntArrayArrayArray2609[var8][-1 + var11][var36] & 2) != 0; --var11) {
+                                }
+
+                                var14 = var8;
+                                var13 = var8;
+
+                                for (var37 = var10; 104 > var37 && (2 & Class38_Sub1.anIntArrayArrayArray2609[var8][var37 - -1][var36]) != 0; ++var37) {
+                                }
+
+                                label503:
+                                while (var13 > 0) {
+                                    for (var15 = var11; var15 <= var37; ++var15) {
+                                        if (0 == (2 & Class38_Sub1.anIntArrayArrayArray2609[-1 + var13][var15][var36])) {
+                                            break label503;
+                                        }
+                                    }
+
+                                    --var13;
+                                }
+
+                                label514:
+                                while (var14 < 3) {
+                                    for (var15 = var11; var15 <= var37; ++var15) {
+                                        if ((2 & Class38_Sub1.anIntArrayArrayArray2609[var14 + 1][var15][var36]) == 0) {
+                                            break label514;
+                                        }
+                                    }
+
+                                    ++var14;
+                                }
+
+                                var15 = (-var11 + var37 - -1) * (-var13 + var14 - -1);
+                                if (8 <= var15) {
+                                    var48 = 240;
+                                    var44 = Class44.anIntArrayArrayArray723[var14][var11][var36] - var48;
+                                    var18 = Class44.anIntArrayArrayArray723[var13][var11][var36];
+                                    Class167.method2263(2, var11 * 128, 128 * var37 + 128, 128 * var36, var36 * 128, var44, var18);
+
+                                    for (var19 = var13; var14 >= var19; ++var19) {
+                                        for (var20 = var11; var20 <= var37; ++var20) {
+                                            Class38_Sub1.anIntArrayArrayArray2609[var19][var20][var36] = Unsorted.bitwiseAnd(Class38_Sub1.anIntArrayArrayArray2609[var19][var20][var36], -3);
+                                        }
+                                    }
+                                }
+                            }
+
+                            if ((4 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var36]) != 0) {
+                                var11 = var10;
+                                var37 = var10;
+
+                                for (var13 = var36; 0 < var13 && 0 != (4 & Class38_Sub1.anIntArrayArrayArray2609[var8][var10][-1 + var13]); --var13) {
+                                }
+
+                                for (var14 = var36; var14 < 104 && (Class38_Sub1.anIntArrayArrayArray2609[var8][var10][var14 + 1] & 4) != 0; ++var14) {
+                                }
+
+                                label554:
+                                while (var11 > 0) {
+                                    for (var15 = var13; var14 >= var15; ++var15) {
+                                        if (0 == (Class38_Sub1.anIntArrayArrayArray2609[var8][var11 + -1][var15] & 4)) {
+                                            break label554;
+                                        }
+                                    }
+
+                                    --var11;
+                                }
+
+                                label565:
+                                while (var37 < 104) {
+                                    for (var15 = var13; var14 >= var15; ++var15) {
+                                        if (0 == (4 & Class38_Sub1.anIntArrayArrayArray2609[var8][1 + var37][var15])) {
+                                            break label565;
+                                        }
+                                    }
+
+                                    ++var37;
+                                }
+
+                                if (4 <= (1 + -var11 + var37) * (var14 - (var13 - 1))) {
+                                    var15 = Class44.anIntArrayArrayArray723[var8][var11][var13];
+                                    Class167.method2263(4, var11 * 128, 128 * var37 - -128, var13 * 128, 128 + 128 * var14, var15, var15);
+
+                                    for (var16 = var11; var37 >= var16; ++var16) {
+                                        for (var44 = var13; var14 >= var44; ++var44) {
+                                            Class38_Sub1.anIntArrayArrayArray2609[var8][var16][var44] = Unsorted.bitwiseAnd(Class38_Sub1.anIntArrayArrayArray2609[var8][var16][var44], -5);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+        } catch (RuntimeException var33) {
+            throw ClientErrorException.clientError(var33, "di.K(" + (var0 != null ? "{...}" : "null") + ',' + var1 + ',' + var2 + ')');
+        }
+    }
+
+    public static void method2187(int var0) {
+        try {
+            Class158_Sub1.aClass94Array2977 = null;
+            Class158_Sub1.aReferenceCache_2982 = null;
+            Class158_Sub1.aClass3_Sub1_2980 = null;
+            if (var0 != 27316) {
+                Class158_Sub1.aBoolean2981 = true;
+            }
+
+        } catch (RuntimeException var2) {
+            throw ClientErrorException.clientError(var2, "di.I(" + var0 + ')');
+        }
+    }
+
+    static void method1629(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, int var19) {
+        int var21;
+        Class126 var20;
+        if (var3 == 0) {
+            var20 = new Class126(var10, var11, var12, var13, -1, var18, false);
+
+            for (var21 = var0; var21 >= 0; --var21) {
+                if (Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] == null) {
+                    Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] = new Class3_Sub2(var21, var1, var2);
+                }
+            }
+
+            Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2].aClass126_2240 = var20;
+        } else if (var3 == 1) {
+            var20 = new Class126(var14, var15, var16, var17, var5, var19, var6 == var7 && var6 == var8 && var6 == var9);
+
+            for (var21 = var0; var21 >= 0; --var21) {
+                if (Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] == null) {
+                    Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] = new Class3_Sub2(var21, var1, var2);
+                }
+            }
+
+            Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2].aClass126_2240 = var20;
+        } else {
+            Class35 var22 = new Class35(var3, var4, var5, var1, var2, var6, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19);
+
+            for (var21 = var0; var21 >= 0; --var21) {
+                if (Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] == null) {
+                    Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var21][var1][var2] = new Class3_Sub2(var21, var1, var2);
+                }
+            }
+
+            Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var0][var1][var2].aClass35_2226 = var22;
+        }
+    }
 }

Client/src/main/java/org/runite/client/Client.java

@@ -13,6 +13,8 @@ import org.rs09.client.filestore.resources.configs.enums.EnumDefinitionProvider;
 import org.rs09.client.filestore.resources.configs.structs.StructDefinitionProvider;
 import org.rs09.client.net.Connection;
 import org.runite.client.drawcalls.LoadingBox;
+import org.runite.client.drawcalls.StartupLoadingBarInitial;
+import org.runite.client.drawcalls.StartupLoadingBar;
 
 import java.awt.*;
 import java.io.IOException;
@@ -31,13 +33,14 @@ public final class Client extends GameShell {
      */
     private static final long serialVersionUID = 8336806252605101745L;
     public static int messageToDisplay = -2;
+    public static RSString loadingBarTextToDisplay = RSString.parse("");
     static HashTable aHashTable_2194 = new HashTable(16);
     static Class3_Sub11[][] aClass3_Sub11ArrayArray2199;
     static int[] anIntArray2200;
     static int ZOOM = 600;
     static int currentPort;
     static int rectDebugInt = 0;
-    static int LoadingStageNumber = 10;
+    public static int LoadingStageNumber = 10;
     static int anInt869;
     static int loginScreenInterfaceID;
     static int anInt2275 = 1;
@@ -806,11 +809,11 @@ public final class Client extends GameShell {
                         Discord.initialize();
                         Discord.updatePresence("At the login screen", "", "");
                     }
-                    Class3_Sub28_Sub1.updateLoadingBar(null, var10, Class3_Sub17.aClass94_2464, LoadingStageNumber);
+                    StartupLoadingBarInitial.draw(ColorCore.loadingbarcolor, var10, loadingBarTextToDisplay, LoadingStageNumber);
                 } else if (5 == Class143.gameStage) {
-                    Class3_Sub23.method406((byte) 117, false, FontType.bold);
+                    StartupLoadingBar.draw(false, FontType.bold);
                 } else if (Class143.gameStage == 10) {
-                    Class3_Sub17.method381(true);
+                    Class3_Sub17.method381();
                 } else if (25 != Class143.gameStage && Class143.gameStage != 28) {
                     if (Class143.gameStage == 30) {
                         Class49.method1127(0);
@@ -1438,9 +1441,9 @@ public final class Client extends GameShell {
                         }
 
                         LoadingStageNumber = 5;
-                        Class3_Sub17.aClass94_2464 = TextCore.AllocatingMemory;
+                        loadingBarTextToDisplay = TextCore.AllocatingMemory;
                     } else {
-                        Class3_Sub17.aClass94_2464 = TextCore.AllocatedMemory;
+                        loadingBarTextToDisplay = TextCore.AllocatedMemory;
                         anInt1354 = 10;
                         LoadingStageNumber = 5;
                     }
@@ -1455,7 +1458,7 @@ public final class Client extends GameShell {
 
                         LoadingStageNumber = 10;
                         anInt1354 = 30;
-                        Class3_Sub17.aClass94_2464 = TextCore.CreatedWorld;
+                        loadingBarTextToDisplay = TextCore.CreatedWorld;
                     } else if (anInt1354 == 30) {
                         if (Unsorted.aClass8_1936 == null) {
                             Unsorted.aClass8_1936 = new Class8(Class58.aJs5Worker_917, TextureOperation31.aCacheResourceWorker_3159);
@@ -1492,10 +1495,10 @@ public final class Client extends GameShell {
                             CacheIndex.particlesConfigIndex = Class8.getCacheIndex(false, true, true, 27);
                             CacheIndex.libIndex = Class8.getCacheIndex(false, true, true, 28);
                             LoadingStageNumber = 15;
-                            Class3_Sub17.aClass94_2464 = TextCore.ConxUpdateServer;
+                            loadingBarTextToDisplay = TextCore.ConxUpdateServer;
                             anInt1354 = 40;
                         } else {
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadingConnecting;
+                            loadingBarTextToDisplay = TextCore.LoadingConnecting;
                             LoadingStageNumber = 12;
                         }
                     } else if (anInt1354 == 40) {
@@ -1507,13 +1510,13 @@ public final class Client extends GameShell {
 
                         if (var2 < 100) { //!= 100
                             if (var2 != 0) {
-                                Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.CheckingForUpdates, RSString.stringAnimator(var2), RSString.parse("(U")});
+                                loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.CheckingForUpdates, RSString.stringAnimator(var2), RSString.parse("(U")});
                             }
 
                             LoadingStageNumber = 20;
                         } else {
                             LoadingStageNumber = 20;
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedUpdateList;
+                            loadingBarTextToDisplay = TextCore.LoadedUpdateList;
                             Sprites.getSpriteFromArchive(CacheIndex.spritesIndex);
                             Class97.method1593(111, CacheIndex.spritesIndex);
                             TextureOperation20.method233(28280, CacheIndex.spritesIndex);
@@ -1533,32 +1536,32 @@ public final class Client extends GameShell {
                         KeyboardListener.loginThemeSongArchiveID = CacheIndex.musicIndex.getArchiveForName(RSString.parse(GameConfig.LOGIN_THEME));
                         LoadingStageNumber = 30;
                         anInt1354 = 50;
-                        Class3_Sub17.aClass94_2464 = TextCore.PreparedSoundEngine;
+                        loadingBarTextToDisplay = TextCore.PreparedSoundEngine;
                     } else if (anInt1354 == 50) {
                         var2 = Sprites.method228(CacheIndex.spritesIndex, CacheIndex.fontsIndex);
                         var3 = 6;
                         if (var3 <= var2) {
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedFonts;
+                            loadingBarTextToDisplay = TextCore.LoadedFonts;
                             LoadingStageNumber = 35;
                             anInt1354 = 60;
                         } else {
-                            Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingFonts, RSString.stringAnimator(100 * var2 / var3), RSString.parse("(U")});
+                            loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingFonts, RSString.stringAnimator(100 * var2 / var3), RSString.parse("(U")});
                             LoadingStageNumber = 35;
                         }
                     } else if (60 == anInt1354) {
                         var2 = Unsorted.method599(CacheIndex.spritesIndex);
                         var3 = 2;
                         if (var3 <= var2) {
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedTitleScreen;
+                            loadingBarTextToDisplay = TextCore.LoadedTitleScreen;
                             anInt1354 = 65;
                         } else {
-                            Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingTitleScreen, RSString.stringAnimator(100 * var2 / var3), RSString.parse("(U")});
+                            loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingTitleScreen, RSString.stringAnimator(100 * var2 / var3), RSString.parse("(U")});
                         }
                         LoadingStageNumber = 40;
                     } else if (anInt1354 == 65) {
                         Class3_Sub28_Sub9.method581(CacheIndex.fontsIndex, CacheIndex.spritesIndex);
                         LoadingStageNumber = 45;
-                        Class3_Sub17.aClass94_2464 = TextCore.OpenedTitleScreen;
+                        loadingBarTextToDisplay = TextCore.OpenedTitleScreen;
                         Class117.method1719(5);
                         anInt1354 = 70;
                     } else if (anInt1354 == 70) {
@@ -1610,24 +1613,24 @@ public final class Client extends GameShell {
                             Unsorted.method2065(CacheIndex.configurationsIndex, CacheIndex.spritesIndex);
                             Class107.method1645(CacheIndex.configurationsIndex, CacheIndex.spritesIndex);
                             LoadingStageNumber = 50;
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedConfig;
+                            loadingBarTextToDisplay = TextCore.LoadedConfig;
                             Class29.method968(128);
                             anInt1354 = 80;
                         } else {
-                            Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingConfig, RSString.stringAnimator(var2 / 11), RSString.parse("(U")});
+                            loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingConfig, RSString.stringAnimator(var2 / 11), RSString.parse("(U")});
                             LoadingStageNumber = 50;
                         }
                     } else if (anInt1354 == 80) {
                         var2 = Sprites.method107(CacheIndex.spritesIndex);
                         var3 = 15;
                         if (var2 < var3) {
-                            Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingSprites, RSString.stringAnimator(var2 * 100 / var3), RSString.parse("(U")});
+                            loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingSprites, RSString.stringAnimator(var2 * 100 / var3), RSString.parse("(U")});
                             LoadingStageNumber = 60;
                         } else {
                             Sprites.method887(CacheIndex.spritesIndex);
                             anInt1354 = 90;
                             LoadingStageNumber = 60;
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedSprites;
+                            loadingBarTextToDisplay = TextCore.LoadedSprites;
                         }
                     } else if (anInt1354 != 90) {
                         if (anInt1354 == 100) {
@@ -1637,7 +1640,7 @@ public final class Client extends GameShell {
                         } else if (anInt1354 == 110) {
                             TextureOperation20.aClass67_1443 = new Class67();
                             Class38.gameSignlink.startThread(10, TextureOperation20.aClass67_1443);
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedInputHandler;
+                            loadingBarTextToDisplay = TextCore.LoadedInputHandler;
                             LoadingStageNumber = 75;
                             anInt1354 = 120;
                         } else if (anInt1354 != 120) {
@@ -1648,34 +1651,34 @@ public final class Client extends GameShell {
                                             if (CacheIndex.worldmapIndex.method2127(TextCore.aClass94_1342)) {
                                                 Class75_Sub4.method1353(Sprites.aClass3_Sub28_Sub16_Sub2Array2140, CacheIndex.worldmapIndex);
                                                 LoadingStageNumber = 95;
-                                                Class3_Sub17.aClass94_2464 = TextCore.LoadedInterfaces;
+                                                loadingBarTextToDisplay = TextCore.LoadedInterfaces;
                                                 anInt1354 = 135;
                                             } else {
-                                                Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(90 - -(CacheIndex.worldmapIndex.method2116(TextCore.aClass94_1342) / 10)), RSString.parse("(U")});
+                                                loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(90 - -(CacheIndex.worldmapIndex.method2116(TextCore.aClass94_1342) / 10)), RSString.parse("(U")});
                                                 LoadingStageNumber = 85;
                                             }
                                         } else {
-                                            Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(85 - -(CacheIndex.fontsIndex.method2136((byte) -124) / 20)), RSString.parse("(U")});
+                                            loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(85 - -(CacheIndex.fontsIndex.method2136((byte) -124) / 20)), RSString.parse("(U")});
                                             LoadingStageNumber = 85;
                                         }
                                     } else {
-                                        Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(75 - -(CacheIndex.interfaceScriptsIndex.method2136((byte) -128) / 10)), RSString.parse("(U")});
+                                        loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(75 - -(CacheIndex.interfaceScriptsIndex.method2136((byte) -128) / 10)), RSString.parse("(U")});
                                         LoadingStageNumber = 85;
                                     }
                                 } else {
-                                    Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(CacheIndex.interfacesIndex.method2136((byte) -123) * 3 / 4), RSString.parse("(U")});
+                                    loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(CacheIndex.interfacesIndex.method2136((byte) -123) * 3 / 4), RSString.parse("(U")});
                                     LoadingStageNumber = 85;
                                 }
                             } else if (135 == anInt1354) {
                                 var2 = Class121.method1735();
                                 if (-1 == var2) {
                                     LoadingStageNumber = 95;
-                                    Class3_Sub17.aClass94_2464 = TextCore.LoadingWLD;
+                                    loadingBarTextToDisplay = TextCore.LoadingWLD;
                                 } else if (var2 == 7 || var2 == 9) {
                                     this.errorPrint("worldlistfull");
                                     Class117.method1719(1000);
                                 } else if (Class30.loadedWorldList) {
-                                    Class3_Sub17.aClass94_2464 = TextCore.LoadedWLD;
+                                    loadingBarTextToDisplay = TextCore.LoadedWLD;
                                     anInt1354 = 140;
                                     LoadingStageNumber = 96;
                                 } else {
@@ -1691,7 +1694,7 @@ public final class Client extends GameShell {
                                 CacheIndex.huffmanEncodingIndex.method2115(-116, true);
                                 CacheIndex.interfacesIndex.method2115(99, true);
                                 LoadingStageNumber = 97;
-                                Class3_Sub17.aClass94_2464 = TextCore.Starting3DLibrary;
+                                loadingBarTextToDisplay = TextCore.Starting3DLibrary;
                                 anInt1354 = 150;
                                 sweepReferenceCache = true;
                             } else if (anInt1354 == 150) {
@@ -1708,18 +1711,18 @@ public final class Client extends GameShell {
                                 GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1);
                                 LoadingStageNumber = 100;
                                 anInt1354 = 160;
-                                Class3_Sub17.aClass94_2464 = TextCore.Started3DLibrary;
+                                loadingBarTextToDisplay = TextCore.Started3DLibrary;
                             } else if (anInt1354 == 160) {
                                 TextureOperation1.method219(true);
                             }
                         } else if (CacheIndex.huffmanEncodingIndex.method2125(RSString.parse(""), TextCore.HasHuffman)) {
                             Class36 var9 = new Class36(CacheIndex.huffmanEncodingIndex.method2123(RSString.parse(""), TextCore.HasHuffman));
                             Class1.method69(var9);
-                            Class3_Sub17.aClass94_2464 = TextCore.LoadedWordPack;
+                            loadingBarTextToDisplay = TextCore.LoadedWordPack;
                             anInt1354 = 130;
                             LoadingStageNumber = 80;
                         } else {
-                            Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingWordPack, TextCore.aClass94_37});
+                            loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingWordPack, TextCore.aClass94_37});
                             LoadingStageNumber = 80;
                         }
                     } else if (CacheIndex.materialsIndex.method2113()) {
@@ -1741,11 +1744,11 @@ public final class Client extends GameShell {
                             Class51.method1137(0.6F);
                         }
 
-                        Class3_Sub17.aClass94_2464 = TextCore.LoadedTextures;
+                        loadingBarTextToDisplay = TextCore.LoadedTextures;
                         anInt1354 = 100;
                         LoadingStageNumber = 70;
                     } else {
-                        Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingTextures, RSString.stringAnimator(CacheIndex.materialsIndex.method2136((byte) -125)), RSString.parse("(U")});
+                        loadingBarTextToDisplay = RSString.stringCombiner(new RSString[]{TextCore.LoadingTextures, RSString.stringAnimator(CacheIndex.materialsIndex.method2136((byte) -125)), RSString.parse("(U")});
                         LoadingStageNumber = 70;
                     }
                 }

Client/src/main/java/org/runite/client/ColorCore.java

@@ -80,7 +80,7 @@ public class ColorCore {
      * Files that use these colors:
      * Class3_Sub28_Sub1.java - method updateLoadingBar
      */
-    static Color loadingbarcolor = new Color(140, 17, 17);
+    public static Color loadingbarcolor = new Color(140, 17, 17);
 
     /**
      * Fun little RGB rainbow method

Client/src/main/java/org/runite/client/Font.java

@@ -710,7 +710,7 @@ public abstract class Font extends Node {
         anInt3748 = 0;
     }
 
-    final void method699(RSString var1, int var2, int var3, int var4, int var5) {
+    public final void method699(RSString var1, int var2, int var3, int var4, int var5) {
         if (var1 != null) {
             this.method698(var4, var5);
             this.method677(var1, var2 - this.method682(var1) / 2, var3);

Client/src/main/java/org/runite/client/HDIndexedSprite.java

@@ -9,7 +9,7 @@ import javax.media.opengl.GL;
 import java.nio.ByteBuffer;
 
 
-final class HDIndexedSprite extends AbstractIndexedSprite {
+public final class HDIndexedSprite extends AbstractIndexedSprite {
 
    private int anInt2675 = -1;
    private int anInt2676 = -1;
@@ -84,7 +84,7 @@ final class HDIndexedSprite extends AbstractIndexedSprite {
       }
    }
 
-   final void method1667(int var1, int var2) {
+   public final void method1667(int var1, int var2) {
       HDToolKit.method1822();
       var1 += this.anInt1470;
       var2 += this.anInt1464;

Client/src/main/java/org/runite/client/HDSprite.java

@@ -229,7 +229,7 @@ public class HDSprite extends AbstractSprite {
         var7.glLoadIdentity();
     }
 
-    final void method639(int var1, int var2, int var3, int var4) {
+    public final void method639(int var1, int var2, int var3, int var4) {
         if (var3 > 0 && var4 > 0) {
             HDToolKit.method1822();
             int var5 = this.width;

Client/src/main/java/org/runite/client/LDIndexedSprite.java

@@ -2,7 +2,7 @@ package org.runite.client;
 
 import org.rs09.client.rendering.Toolkit;
 
-final class LDIndexedSprite extends AbstractIndexedSprite {
+public final class LDIndexedSprite extends AbstractIndexedSprite {
 
    private final int[] anIntArray2673;
    byte[] raster;
@@ -394,7 +394,7 @@ final class LDIndexedSprite extends AbstractIndexedSprite {
       method1670(Toolkit.JAVA_TOOLKIT.getBuffer(), this.raster, this.anIntArray2673, var7, var8, var13, var14, var3, var4, var11, var12, var5);
    }
 
-   final void method1667(int var1, int var2) {
+   public final void method1667(int var1, int var2) {
       var1 += this.anInt1470;
       var2 += this.anInt1464;
       int var3 = var1 + var2 * Toolkit.JAVA_TOOLKIT.width;

Client/src/main/java/org/runite/client/MapUnderlayColorDefinition.java

@@ -12,6 +12,26 @@ final class MapUnderlayColorDefinition {
     int anInt1417;
     int anInt1418;
 
+    static MapUnderlayColorDefinition method629(int var1) {
+       try {
+          MapUnderlayColorDefinition var2 = (MapUnderlayColorDefinition)Class44.aReferenceCache_725.get(var1);
+          if(var2 == null) {
+             byte[] var3 = Class3_Sub23.aClass153_2536.getFile(1, var1);
+             var2 = new MapUnderlayColorDefinition();
+             if(null != var3) {
+                var2.parseUnderlayDefinition(var1, new DataBuffer(var3));
+             }
+
+             Class44.aReferenceCache_725.put(var2, var1);
+             return var2;
+          } else {
+             return var2;
+          }
+       } catch (RuntimeException var4) {
+          throw ClientErrorException.clientError(var4, "qc.B(" + true + ',' + var1 + ')');
+       }
+    }
+
     final void parseUnderlayDefinition(int var1, DataBuffer buffer) {
         try {
             while (true) {

Client/src/main/java/org/runite/client/PacketParser.java

@@ -1064,7 +1064,7 @@ public final class PacketParser {
                                                         return true;
                                                     } else if (Unsorted.incomingOpcode == 191) {
                                                         nodeModelId = BufferedDataStream.incomingBuffer.readUnsignedShortLE();
-                                                        Class3_Sub28_Sub1.method532(nodeModelId);
+                                                        CS2Methods.method532(nodeModelId);
                                                         QuickChatDefinition.anIntArray3565[Unsorted.bitwiseAnd(31, Unsorted.anInt944++)] = Unsorted.bitwiseAnd(nodeModelId, 32767);
                                                         Unsorted.incomingOpcode = -1;
                                                         return true;

Client/src/main/java/org/runite/client/RSString.java

@@ -994,7 +994,7 @@ public final class RSString implements Interface3 {
         }
     }
 
-    final int method1575(FontMetrics var2) {
+    public final int method1575(FontMetrics var2) {
         try {
             String var3;
             var3 = new String(this.buffer, 0, this.length, StandardCharsets.ISO_8859_1);

Client/src/main/java/org/runite/client/SequenceDefinition.java

@@ -15,7 +15,7 @@ public final class SequenceDefinition {
 	public static CacheIndex aClass153_1852;
 	int leftHandItem = -1;
 	boolean[] aBooleanArray1855;
-	static AbstractIndexedSprite aClass109_1856;
+	public static AbstractIndexedSprite aClass109_1856;
 	int forcedPriority = 5;
 	boolean aBoolean1859 = false;
 	static CacheIndex animationReferenceIndex;

Client/src/main/java/org/runite/client/TextCore.java

@@ -51,7 +51,7 @@ public class TextCore {
      * Login Screen Text
      * Files that use these texts:
      */
-    static RSString RSLoadingPleaseWait = RSString.parse(GameConfig.SERVER_NAME + " is loading )2 please wait)3)3)3");
+    public static RSString RSLoadingPleaseWait = RSString.parse(GameConfig.SERVER_NAME + " is loading )2 please wait)3)3)3");
     static RSString LoadingConfig = RSString.parse("Loading config )2 ");
     static RSString LoadedConfig = RSString.parse("Loaded config");
     static RSString LoadingSprites = RSString.parse("Loading sprites )2 ");
@@ -244,7 +244,7 @@ public class TextCore {
     /**
      * Fonts
      */
-    static java.awt.Font Helvetica = new java.awt.Font("Helvetica", java.awt.Font.BOLD, 13);
+    public static java.awt.Font Helvetica = new java.awt.Font("Helvetica", java.awt.Font.BOLD, 13);
     /**
      * Unsorted
      */

Client/src/main/java/org/runite/client/TextureOperation10.java

@@ -447,22 +447,4 @@ final class TextureOperation10 extends TextureOperation {
       return false;
    }
 
-   static Class168 method350(byte var0, int var1) {
-      try {
-         Class168 var2 = (Class168)Class163_Sub2_Sub1.aReferenceCache_4015.get(var1);
-         if(null == var2) {
-            byte[] var4 = Class3_Sub28_Sub5.aClass153_3580.getFile(4, var1);
-            var2 = new Class168();
-            if(var4 != null) {
-               var2.method2274(new DataBuffer(var4), var1);
-            }
-
-            Class163_Sub2_Sub1.aReferenceCache_4015.put(var2, var1);
-         }
-          return var2;
-      } catch (RuntimeException var5) {
-         throw ClientErrorException.clientError(var5, "um.C(" + var0 + ',' + var1 + ')');
-      }
-   }
-
 }

Client/src/main/java/org/runite/client/TextureOperation7.java

@@ -288,7 +288,7 @@ final class TextureOperation7 extends TextureOperation {
                }
 
                if(0 != var18) {
-                  MapUnderlayColorDefinition var19 = Class158_Sub1.method629(-1 + (255 & var18));
+                  MapUnderlayColorDefinition var19 = MapUnderlayColorDefinition.method629(-1 + (255 & var18));
                   var15[var16][var17] = (1 + var19.anInt1412 << 16) - -var19.anInt1414;
                }
             }

Client/src/main/java/org/runite/client/Unsorted.java

@@ -9,9 +9,7 @@ import org.rs09.client.data.ReferenceCache;
 import org.rs09.client.net.Connection;
 import org.rs09.client.rendering.Toolkit;
 import org.rs09.client.util.ArrayUtils;
-import org.runite.client.drawcalls.Compass;
+import org.runite.client.drawcalls.*;
-import org.runite.client.drawcalls.LoadingBox;
-import org.runite.client.drawcalls.Minimap;
 
 import java.awt.*;
 import java.io.IOException;
@@ -1395,7 +1393,7 @@ public class Unsorted {
             if (var1 == 3 && TextureOperation30.fullScreenFrame == null) {
                 method598(true, anInt2577, true, var3, var4, -1, -1);
             } else {
-                Object var7;
+                Container var7;
                 if (null == TextureOperation30.fullScreenFrame) {
                     if (null == GameShell.frame) {
                         var7 = Class38.gameSignlink.gameApplet;
@@ -1406,8 +1404,8 @@ public class Unsorted {
                     var7 = TextureOperation30.fullScreenFrame;
                 }
 
-                frameWidth = ((Container) var7).getSize().width;
+                frameWidth = var7.getSize().width;
-                Class70.frameHeight = ((Container) var7).getSize().height;
+                Class70.frameHeight = var7.getSize().height;
                 Insets var8;
                 if (GameShell.frame == var7) {
                     var8 = GameShell.frame.getInsets();
@@ -1467,7 +1465,7 @@ public class Unsorted {
                         aClass158_3009 = TextureOperation18.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, GameShell.canvas);
                         Class74.method1320();
                         if (5 == Class143.gameStage) {
-                            Class3_Sub23.method406((byte) 122, true, FontType.bold);
+                            StartupLoadingBar.draw(true, FontType.bold);
                         } else {
                             LoadingBox.draw(false, TextCore.LoadingPleaseWait2);
                         }
@@ -3668,10 +3666,10 @@ public class Unsorted {
                         }
 
                         int var14 = var1 + var11.anInt210;
-                        int var15 = var11.anInt223;
+                        int alpha = var11.anInt223;
                         int var13 = var11.anInt306 + var2;
-                        if (ClientCommands.commandQaOpEnabled && (0 != Client.method44(var11).anInt2205 || var11.type == 0) && var15 > 127) {
+                        if (ClientCommands.commandQaOpEnabled && (0 != Client.method44(var11).anInt2205 || var11.type == 0) && alpha > 127) {
-                            var15 = 127;
+                            alpha = 127;
                         }
 
                         int var17;
@@ -3710,7 +3708,7 @@ public class Unsorted {
                             }
 
                             if (!var11.aBoolean200) {
-                                var15 = 128;
+                                alpha = 128;
                             }
                         }
 
@@ -4142,29 +4140,29 @@ public class Unsorted {
                                             }
                                         }
 
-                                        if (var15 != 0) {
+                                        /* INTERFACE DRAWS ALPHA/NON-ALPHA BOXES/BACKGROUNDS */
+                                        if (alpha != 0) {
                                             if (var11.aBoolean226) {
                                                 if (HDToolKit.highDetail) {
-                                                    Toolkit.OPENGL_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 256 + -(255 & var15));//Background for mage book
+                                                    Toolkit.OPENGL_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 256 + -(255 & alpha));//Magic book spell tool-tip hover background draw
                                                 } else {
-                                                    Toolkit.JAVA_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 256 + -(255 & var15));
+                                                    Toolkit.JAVA_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 256 + -(255 & alpha));
                                                 }
                                             } else if (HDToolKit.highDetail) {
-                                                Class22.method928(var13, var14, var11.width, var11.height, var20, 256 + -(var15 & 0xFF));
+                                                Class22.method928(var13, var14, var11.width, var11.height, var20, 256 + -(alpha & 0xFF));//Interface backgrounds (includes dark areas)
                                             } else {
-                                                Class74.method1315(var13, var14, var11.width, var11.height, var20, -(var15 & 0xFF) + 256);
+                                                Class74.method1315(var13, var14, var11.width, var11.height, var20, -(alpha & 0xFF) + 256);//Interface backgrounds (includes dark areas)
                                             }
                                         } else if (var11.aBoolean226) {
                                             if (HDToolKit.highDetail) {
-                                                Toolkit.OPENGL_TOOLKIT.method934(var13, var14, var11.width, var11.height, var20);
+                                                Toolkit.OPENGL_TOOLKIT.method934(var13, var14, var11.width, var11.height, var20);//Skill tool-tip hover background draw
                                             } else {
-                                                Toolkit.JAVA_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 255);
+                                                Toolkit.JAVA_TOOLKIT.fillRect(var13, var14, var11.width, var11.height, var20, 255);//Skill tool-tip pop up background
                                             }
-                                            //Toolkit.getActiveToolkit().method934(var13, var14, var11.width, var11.height, var20);//Fill Rectangle for skill hover
                                         } else if (HDToolKit.highDetail) {
-                                            Toolkit.OPENGL_TOOLKIT.drawRect(var13, var14, var11.width, var11.height, var20, 255);//Background border for mage book
+                                            Toolkit.OPENGL_TOOLKIT.drawRect(var13, var14, var11.width, var11.height, var20, 255);//Boxed border background draw
                                         } else {
-                                            Toolkit.JAVA_TOOLKIT.drawRect(var13, var14, var11.width, var11.height, var20, 255);
+                                            Toolkit.JAVA_TOOLKIT.drawRect(var13, var14, var11.width, var11.height, var20, 255);//Boxed border background draw
                                         }
                                         // TODO DRAWRECT
 //                                        if (Class3_Sub28_Sub12.method609(var11, 26)) {
@@ -4266,34 +4264,34 @@ public class Unsorted {
                                                             var46 = Class140_Sub6.method2021((byte) -113, var37.height);
                                                             HDSprite var27 = (HDSprite) var37;
                                                             if (var39 && var46) {
-                                                                if (var15 == 0) {
+                                                                if (alpha == 0) {
                                                                     var27.method649(var13, var14, var23, var24);
                                                                 } else {
-                                                                    var27.method646(var13, var14, -(255 & var15) + 256, var23, var24);
+                                                                    var27.method646(var13, var14, -(255 & alpha) + 256, var23, var24);
                                                                 }
                                                             } else if (var39) {
                                                                 for (var28 = 0; var28 < var24; ++var28) {
-                                                                    if (var15 == 0) {
+                                                                    if (alpha == 0) {
                                                                         var27.method649(var13, var28 * var22 + var14, var23, 1);
                                                                     } else {
-                                                                        var27.method646(var13, var14 + var28 * var22, 256 + -(var15 & 0xFF), var23, 1);
+                                                                        var27.method646(var13, var14 + var28 * var22, 256 + -(alpha & 0xFF), var23, 1);
                                                                     }
                                                                 }
                                                             } else if (var46) {
                                                                 for (var28 = 0; var28 < var23; ++var28) {
-                                                                    if (var15 == 0) {
+                                                                    if (alpha == 0) {
                                                                         var27.method649(var21 * var28 + var13, var14, 1, var24);
                                                                     } else {
-                                                                        var27.method646(var21 * var28 + var13, var14, -(var15 & 0xFF) + 256, 1, var24);
+                                                                        var27.method646(var21 * var28 + var13, var14, -(alpha & 0xFF) + 256, 1, var24);
                                                                     }
                                                                 }
                                                             } else {
                                                                 for (var28 = 0; var23 > var28; ++var28) {
                                                                     for (var29 = 0; var29 < var24; ++var29) {
-                                                                        if (var15 == 0) {
+                                                                        if (alpha == 0) {
                                                                             var37.drawAt(var13 - -(var21 * var28), var22 * var29 + var14);
                                                                         } else {
-                                                                            var37.method637(var28 * var21 + var13, var22 * var29 + var14, -(255 & var15) + 256);
+                                                                            var37.method637(var28 * var21 + var13, var22 * var29 + var14, -(255 & alpha) + 256);
                                                                         }
                                                                     }
                                                                 }
@@ -4306,10 +4304,10 @@ public class Unsorted {
                                                             for (var25 = 0; var25 < var23; ++var25) {
                                                                 for (var26 = 0; var24 > var26; ++var26) {
                                                                     if (var11.anInt301 == 0) {
-                                                                        if (0 == var15) {
+                                                                        if (0 == alpha) {
                                                                             var37.drawAt(var25 * var21 + var13, var22 * var26 + var14);
                                                                         } else {
-                                                                            var37.method637(var25 * var21 + var13, var14 + var26 * var22, 256 - (255 & var15));
+                                                                            var37.method637(var25 * var21 + var13, var14 + var26 * var22, 256 - (255 & alpha));
                                                                         }
                                                                     } else {
                                                                         var37.drawScaledOrRotated(var14 - -(var22 * var26) + var22 / 2, var11.anInt301, 4096, var25 * var21 + var13 + var21 / 2);
@@ -4322,8 +4320,8 @@ public class Unsorted {
                                                     } else {
                                                         var23 = var11.width * 4096 / var21;
                                                         if (var11.anInt301 == 0) {
-                                                            if (0 != var15) {
+                                                            if (0 != alpha) {
-                                                                var37.method642(var13, var14, var11.width, var11.height, -(255 & var15) + 256);
+                                                                var37.method642(var13, var14, var11.width, var11.height, -(255 & alpha) + 256);
                                                             } else if (var11.width == var21 && var11.height == var22) {
                                                                 var37.drawAt(var13, var14);
                                                             } else {
@@ -4715,7 +4713,7 @@ public class Unsorted {
 
     public static void method1517() {
         try {
-            Class3_Sub28_Sub1.aFontMetrics1822 = null;
+            StartupLoadingBarInitial.aFontMetrics1822 = null;
 
             //MillisTimer.anImage2695 = null;
         } catch (RuntimeException var2) {

Client/src/main/java/org/runite/client/drawcalls/Compass.java

@@ -2,10 +2,9 @@ package org.runite.client.drawcalls;
 
 import org.runite.client.*;
 
-public class Compass {
+public final class Compass {
 
     public static void drawCompass(int var0, int var1, RSInterface var2, int var3) {
-        try {
         if (HDToolKit.highDetail) {
             Class22.setClipping(var0, var1, var2.width + var0, var2.height + var1);
         }
@@ -26,8 +25,5 @@ public class Compass {
         }
 
         Class163_Sub1_Sub1.aBooleanArray4008[var3] = true;
-        } catch (RuntimeException var6) {
-            throw ClientErrorException.clientError(var6, "mj.K(" + var0 + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ',' + var3 + ',' + (byte) 59 + ')');
-        }
     }
 }

Client/src/main/java/org/runite/client/drawcalls/ContextMenu.java

@@ -4,10 +4,9 @@ import org.rs09.client.config.GameConfig;
 import org.rs09.client.rendering.Toolkit;
 import org.runite.client.*;
 
-public class ContextMenu {
+public final class ContextMenu {
 
     public static void draw() {
-        try {
         int x = Class21.anInt1462;
         int y = Class21.anInt3395;
         int width = Class21.anInt3552;
@@ -37,8 +36,5 @@ public class ContextMenu {
         }
 
         Unsorted.method1282(Class21.anInt1462, Class21.anInt3395, Class21.anInt3537, Class21.anInt3552);
-        } catch (RuntimeException var11) {
-            throw ClientErrorException.clientError(var11, "lf.A(" + -117 + ')');
-        }
     }
 }

Client/src/main/java/org/runite/client/drawcalls/LoadingBox.java

@@ -5,10 +5,9 @@ import org.runite.client.*;
 
 import java.awt.*;
 
-public class LoadingBox {
+public final class LoadingBox {
 
     public static void draw(boolean var1, RSString var2) {
-        try {
         byte var3 = 4;
         int var4 = var3 + 6;
         int var5 = var3 + 6;
@@ -35,8 +34,5 @@ public class LoadingBox {
         } else {
             Unsorted.method1282(var4, var5, var7, var6);
         }
-        } catch (RuntimeException var10) {
-            throw ClientErrorException.clientError(var10, "j.TA(" + ',' + var1 + ',' + (var2 != null ? "{...}" : "null") + ')');
-        }
     }
 }

Client/src/main/java/org/runite/client/drawcalls/Minimap.java

@@ -5,25 +5,25 @@ import org.runite.client.*;
 
 import java.util.Objects;
 
-public class Minimap {
+public final class Minimap {
+
     public static void displayMinimap(int var0, byte var1, int var2, int var3, RSInterface var4) {
-       try {
         Class58.method1194();
 
-          if(HDToolKit.highDetail) {
+        if (HDToolKit.highDetail) {
             Class22.setClipping(var3, var2, var3 + var4.width, var2 + var4.height);
         } else {
             Class74.setClipping(var3, var2, var3 - -var4.width, var2 + var4.height);
         }
 
-          if(2 != Class161.anInt2028 && 5 != Class161.anInt2028 && Class49.aAbstractSprite_812 != null) {
+        if (2 != Class161.anInt2028 && 5 != Class161.anInt2028 && Class49.aAbstractSprite_812 != null) {
             int var19 = TextureOperation9.anInt3102 + GraphicDefinition.CAMERA_DIRECTION & 0x7FF;//Region Rotation (relative to player camera)
             int var6 = Class102.player.xAxis / 32 + 48;//Minimap X Axis (relative to player) Used as offset
             int var7 = -(Class102.player.zAxis / 32) + 464;//Minimap Y Axis (relative to player) Used as offset
-             if(HDToolKit.highDetail) {
+            if (HDToolKit.highDetail) {
-                ((HDSprite)Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, Class164_Sub2.anInt3020 + 256, (HDSprite)var4.method866(false));
+                ((HDSprite) Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, Class164_Sub2.anInt3020 + 256, (HDSprite) var4.method866(false));
             } else {
-                ((Class3_Sub28_Sub16_Sub2)Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, 256 - -Class164_Sub2.anInt3020, var4.anIntArray207, var4.anIntArray291);
+                ((Class3_Sub28_Sub16_Sub2) Class49.aAbstractSprite_812).drawMinimapRegion(var3, var2, var4.width, var4.height, var6, var7, var19, 256 - -Class164_Sub2.anInt3020, var4.anIntArray207, var4.anIntArray291);
             }
 
             int var9;
@@ -34,9 +34,9 @@ public class Minimap {
             int var14;
             int var17;
             int var16;
-             if(null != TextureOperation22.aClass131_3421) {
+            if (null != TextureOperation22.aClass131_3421) {
-                for(int var8 = 0; var8 < TextureOperation22.aClass131_3421.anInt1720; ++var8) {
+                for (int var8 = 0; var8 < TextureOperation22.aClass131_3421.anInt1720; ++var8) {
-                   if(TextureOperation22.aClass131_3421.method1789(var8, var1 ^ 553)) {
+                    if (TextureOperation22.aClass131_3421.method1789(var8, var1 ^ 553)) {
                         var9 = 2 + 4 * (TextureOperation22.aClass131_3421.aShortArray1727[var8] + -Class131.anInt1716) + -(Class102.player.xAxis / 32);
                         var11 = Class51.anIntArray840[var19];
                         var12 = Class51.anIntArray851[var19];
@@ -45,31 +45,31 @@ public class Minimap {
                         var10 = 2 + 4 * (-Texture.anInt1152 + TextureOperation22.aClass131_3421.aShortArray1718[var8]) - Class102.player.zAxis / 32;
                         var12 = var12 * 256 / (256 + Class164_Sub2.anInt3020);
                         var14 = -(var9 * var11) + var10 * var12 >> 16;
-                      if(TextureOperation22.aClass131_3421.method1791(var8, var1 + -51) == 1) {
+                        if (TextureOperation22.aClass131_3421.method1791(var8, var1 + -51) == 1) {
                             var15 = FontType.plainFont;
                         }
 
-                      if(2 == TextureOperation22.aClass131_3421.method1791(var8, 8)) {
+                        if (2 == TextureOperation22.aClass131_3421.method1791(var8, 8)) {
                             var15 = FontType.bold;
                         }
 
                         var13 = var11 * var10 - -(var12 * var9) >> 16;
                         var16 = var15.method680(TextureOperation22.aClass131_3421.aClass94Array1721[var8], 100);
                         var13 -= var16 / 2;
-                      if(-var4.width <= var13 && var13 <= var4.width && var14 >= -var4.height && var14 <= var4.height) {
+                        if (-var4.width <= var13 && var13 <= var4.width && var14 >= -var4.height && var14 <= var4.height) {
                             var17 = 16777215;
-                         if(TextureOperation22.aClass131_3421.anIntArray1725[var8] != -1) {
+                            if (TextureOperation22.aClass131_3421.anIntArray1725[var8] != -1) {
                                 var17 = TextureOperation22.aClass131_3421.anIntArray1725[var8];
                             }
 
-                         if(HDToolKit.highDetail) {
+                            if (HDToolKit.highDetail) {
                                 Class22.method936((HDSprite) Objects.requireNonNull(var4.method866(false)));
                             } else {
                                 Class74.method1314(var4.anIntArray207, var4.anIntArray291);
                             }
 
                             var15.method693(TextureOperation22.aClass131_3421.aClass94Array1721[var8], var3 + var13 + var4.width / 2, var2 + var4.height / 2 + -var14, var16, 50, var17, 0, 1, 0, 0);
-                         if(HDToolKit.highDetail) {
+                            if (HDToolKit.highDetail) {
                                 Class22.method921();
                             } else {
                                 Class74.method1310();
@@ -79,13 +79,13 @@ public class Minimap {
                 }
             }
 
-             for(var9 = 0; MouseListeningClass.anInt1924 > var9; ++var9) {
+            for (var9 = 0; MouseListeningClass.anInt1924 > var9; ++var9) {
                 var10 = -(Class102.player.xAxis / 32) + 2 + 4 * Class84.anIntArray1163[var9];
                 var11 = -(Class102.player.zAxis / 32) + 2 + (Unsorted.anIntArray4050[var9] * 4);
                 ObjectDefinition var20 = ObjectDefinition.getObjectDefinition(Class3_Sub19.anIntArray3693[var9]);
-                if(null != var20.ChildrenIds) {
+                if (null != var20.ChildrenIds) {
                     var20 = var20.method1685(var1 + -59);
-                   if(null == var20 || var20.MapIcon == -1) {
+                    if (null == var20 || var20.MapIcon == -1) {
                         continue;
                     }
                 }
@@ -93,10 +93,10 @@ public class Minimap {
                 Class38_Sub1.minimapIcons(var4, Class140_Sub4.aAbstractSpriteArray2839[var20.MapIcon], var11, var10, var2, var3);
             }
 
-             for(var9 = 0; 104 > var9; ++var9) {
+            for (var9 = 0; 104 > var9; ++var9) {
-                for(var10 = 0; var10 < 104; ++var10) {
+                for (var10 = 0; var10 < 104; ++var10) {
                     LinkedList var25 = Class39.aLinkedListArrayArrayArray3273[WorldListCountry.localPlane][var9][var10];
-                   if(null != var25) {
+                    if (null != var25) {
                         var12 = 2 + var9 * 4 + -(Class102.player.xAxis / 32);
                         var13 = -(Class102.player.zAxis / 32) + 2 + 4 * var10;
                         Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[0], var13, var12, var2, var3);
@@ -104,18 +104,18 @@ public class Minimap {
                 }
             }
 
-             for(var9 = 0; var9 < Class163.localNPCCount; ++var9) {
+            for (var9 = 0; var9 < Class163.localNPCCount; ++var9) {
                 NPC var21 = NPC.npcs[Class15.localNPCIndexes[var9]];
-                if(var21 != null && var21.hasDefinitions()) {
+                if (var21 != null && var21.hasDefinitions()) {
                     NPCDefinition var22 = var21.definition;
-                   if(null != var22 && null != var22.childNPCs) {
+                    if (null != var22 && null != var22.childNPCs) {
-                      var22 = var22.method1471((byte)-3);
+                        var22 = var22.method1471((byte) -3);
                     }
 
-                   if(var22 != null && var22.aBoolean1285 && var22.aBoolean1270) {
+                    if (var22 != null && var22.aBoolean1285 && var22.aBoolean1270) {
                         var12 = var21.xAxis / 32 - Class102.player.xAxis / 32;
                         var13 = var21.zAxis / 32 + -(Class102.player.zAxis / 32);
-                      if(var22.anInt1283 == -1) {
+                        if (var22.anInt1283 == -1) {
                             Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[1], var13, var12, var2, var3);
                         } else {
                             Class38_Sub1.minimapIcons(var4, Class140_Sub4.aAbstractSpriteArray2839[var22.anInt1283], var13, var12, var2, var3);
@@ -124,16 +124,16 @@ public class Minimap {
                 }
             }
 
-             for(var9 = 0; var9 < Class159.localPlayerCount; ++var9) {
+            for (var9 = 0; var9 < Class159.localPlayerCount; ++var9) {
                 Player var23 = Unsorted.players[Class56.localPlayerIndexes[var9]];
-                if(null != var23 && var23.hasDefinitions()) {
+                if (null != var23 && var23.hasDefinitions()) {
                     var12 = var23.zAxis / 32 - Class102.player.zAxis / 32;
                     var11 = -(Class102.player.xAxis / 32) + var23.xAxis / 32;
                     long var29 = var23.displayName.toLong();
                     boolean var28 = false;
 
-                   for(var16 = 0; var16 < Class8.anInt104; ++var16) {
+                    for (var16 = 0; var16 < Class8.anInt104; ++var16) {
-                      if(Class50.aLongArray826[var16] == var29 && 0 != Unsorted.anIntArray882[var16]) {
+                        if (Class50.aLongArray826[var16] == var29 && 0 != Unsorted.anIntArray882[var16]) {
                             var28 = true;
                             break;
                         }
@@ -141,21 +141,21 @@ public class Minimap {
 
                     boolean var31 = false;
 
-                   for(var17 = 0; Unsorted.clanSize > var17; ++var17) {
+                    for (var17 = 0; Unsorted.clanSize > var17; ++var17) {
-                      if(var29 == PacketParser.aClass3_Sub19Array3694[var17].linkableKey) {
+                        if (var29 == PacketParser.aClass3_Sub19Array3694[var17].linkableKey) {
                             var31 = true;
                             break;
                         }
                     }
 
                     boolean var32 = false;
-                   if(Class102.player.teamId != 0 && 0 != var23.teamId && var23.teamId == Class102.player.teamId) {
+                    if (Class102.player.teamId != 0 && 0 != var23.teamId && var23.teamId == Class102.player.teamId) {
                         var32 = true;
                     }
 
-                   if(var28) {
+                    if (var28) {
                         Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[3], var12, var11, var2, var3);
-                   } else if(var31) {
+                    } else if (var31) {
                         Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[5], var12, var11, var2, var3);
                     } else if (var32) {
                         Class38_Sub1.minimapIcons(var4, Unsorted.aAbstractSpriteArray1136[4], var12, var11, var2, var3);
@@ -167,27 +167,27 @@ public class Minimap {
 
             Class96[] var24 = ClientErrorException.aClass96Array2114;
 
-             for(var10 = 0; var24.length > var10; ++var10) {
+            for (var10 = 0; var24.length > var10; ++var10) {
                 Class96 var26 = var24[var10];
-                if(null != var26 && var26.anInt1360 != 0 && Class44.anInt719 % 20 < 10) {
+                if (null != var26 && var26.anInt1360 != 0 && Class44.anInt719 % 20 < 10) {
-                   if(var26.anInt1360 == 1 && var26.anInt1359 >= 0 && var26.anInt1359 < NPC.npcs.length) {
+                    if (var26.anInt1360 == 1 && var26.anInt1359 >= 0 && var26.anInt1359 < NPC.npcs.length) {
                         NPC var27 = NPC.npcs[var26.anInt1359];
-                      if(null != var27) {
+                        if (null != var27) {
                             var13 = -(Class102.player.xAxis / 32) + var27.xAxis / 32;
                             var14 = var27.zAxis / 32 + -(Class102.player.zAxis / 32);
                             Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4);
                         }
                     }
 
-                   if(var26.anInt1360 == 2) {
+                    if (var26.anInt1360 == 2) {
                         var12 = (-Class131.anInt1716 + var26.anInt1356) * 4 + 2 - Class102.player.xAxis / 32;
                         var13 = -(Class102.player.zAxis / 32) + 2 + (-Texture.anInt1152 + var26.anInt1347) * 4;
                         Class53.method1171(var26.anInt1351, var2, var3, var12, var13, var4);
                     }
 
-                   if(var26.anInt1360 == 10 && var26.anInt1359 >= 0 && Unsorted.players.length > var26.anInt1359) {
+                    if (var26.anInt1360 == 10 && var26.anInt1359 >= 0 && Unsorted.players.length > var26.anInt1359) {
                         Player var30 = Unsorted.players[var26.anInt1359];
-                      if(null != var30) {
+                        if (null != var30) {
                             var14 = var30.zAxis / 32 + -(Class102.player.zAxis / 32);
                             var13 = var30.xAxis / 32 + -(Class102.player.xAxis / 32);
                             Class53.method1171(var26.anInt1351, var2, var3, var13, var14, var4);
@@ -196,27 +196,24 @@ public class Minimap {
                 }
             }
 
-             if(Class65.anInt987 != 0) {
+            if (Class65.anInt987 != 0) {
                 var9 = 4 * Class65.anInt987 + (2 - Class102.player.xAxis / 32);
                 var10 = 2 + 4 * Class45.anInt733 - Class102.player.zAxis / 32;
                 Class38_Sub1.minimapIcons(var4, Class45.aAbstractSprite_736, var10, var9, var2, var3);
             }
             Toolkit.getActiveToolkit().method934(-1 + (var3 - -(var4.width / 2)), -1 + var2 - -(var4.height / 2), 3, 3, 16777215);
 
-          } else if(HDToolKit.highDetail) {
+        } else if (HDToolKit.highDetail) {
             AbstractSprite var5 = var4.method866(false);
-             if(null != var5) {
+            if (null != var5) {
                 var5.drawAt(var3, var2);
             }
         } else {
             Class74.method1332(var3, var2, var4.anIntArray207, var4.anIntArray291);
         }
 
-          if(var1 == 59) {
+        if (var1 == 59) {
             Class163_Sub1_Sub1.aBooleanArray4008[var0] = true;
         }
-       } catch (RuntimeException var18) {
-          throw ClientErrorException.clientError(var18, "ed.B(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + (var4 != null?"{...}":"null") + ')');
-       }
     }
 }

Client/src/main/java/org/runite/client/drawcalls/StartupLoadingBar.java

@@ -0,0 +1,26 @@
+package org.runite.client.drawcalls;
+
+import org.rs09.client.rendering.Toolkit;
+import org.runite.client.*;
+
+public final class StartupLoadingBar {
+
+    public static void draw(boolean var1, Font var2) {
+        int var3;
+        if (HDToolKit.highDetail || var1) {
+            var3 = Class140_Sub7.canvasHeight;
+            int var4 = var3 * 956 / 503;
+            Class40.aAbstractSprite_680.method639((Class23.canvasWidth + -var4) / 2, 0, var4, var3);
+            SequenceDefinition.aClass109_1856.method1667(-(SequenceDefinition.aClass109_1856.width / 2) + Class23.canvasWidth / 2, 18);
+        }
+
+        var2.method699(TextCore.RSLoadingPleaseWait, Class23.canvasWidth / 2, Class140_Sub7.canvasHeight / 2 - 26, 16777215, -1);
+        var3 = Class140_Sub7.canvasHeight / 2 + -18;
+        Toolkit.getActiveToolkit().drawRect(Class23.canvasWidth / 2 - 152, var3, 304, 34, 9179409, 255);
+        Toolkit.getActiveToolkit().drawRect(-151 + Class23.canvasWidth / 2, var3 - -1, 302, 32, 0, 255);
+        Toolkit.getActiveToolkit().method934(Class23.canvasWidth / 2 - 150, var3 + 2, Client.LoadingStageNumber * 3, 30, 9179409);
+        Toolkit.getActiveToolkit().method934(Class23.canvasWidth / 2 + -150 - -(3 * Client.LoadingStageNumber), 2 + var3, 300 + -(3 * Client.LoadingStageNumber), 30, 0);
+
+        var2.method699(Client.loadingBarTextToDisplay, Class23.canvasWidth / 2, 4 + Class140_Sub7.canvasHeight / 2, 16777215, -1);
+    }
+}

Client/src/main/java/org/runite/client/drawcalls/StartupLoadingBarInitial.java

@@ -0,0 +1,63 @@
+package org.runite.client.drawcalls;
+
+import org.runite.client.*;
+
+import java.awt.*;
+
+public class StartupLoadingBarInitial {
+
+
+    public static FontMetrics aFontMetrics1822;
+    public static Image anImage2695;
+
+    public static void draw(Color var0, boolean var2, RSString var3, int var4) {
+
+        try {
+            Graphics var5 = GameShell.canvas.getGraphics();
+            aFontMetrics1822 = GameShell.canvas.getFontMetrics(TextCore.Helvetica);
+            if (var2) {
+                var5.setColor(Color.black);
+                var5.fillRect(0, 0, Class23.canvasWidth, Class140_Sub7.canvasHeight);
+            }
+
+            try {
+                if (anImage2695 == null) {
+                    anImage2695 = GameShell.canvas.createImage(304, 34);
+                }
+
+                Graphics var6 = anImage2695.getGraphics();
+                var6.setColor(var0);
+                var6.drawRect(0, 0, 303, 33);
+                var6.fillRect(2, 2, var4 * 3, 30);
+                var6.setColor(Color.black);
+                var6.drawRect(1, 1, 301, 31);
+                var6.fillRect(3 * var4 + 2, 2, -(3 * var4) + 300, 30);
+                var6.setFont(TextCore.Helvetica);
+                var6.setColor(Color.white);
+                var3.drawString(var6, 22, (-var3.method1575(aFontMetrics1822) + 304) / 2);
+                var5.drawImage(anImage2695, Class23.canvasWidth / 2 - 152, -18 + Class140_Sub7.canvasHeight / 2, null);
+            } catch (Exception var9) {
+                int var7 = -152 + Class23.canvasWidth / 2;
+                int var8 = -18 + Class140_Sub7.canvasHeight / 2;
+                var5.setColor(var0);
+                var5.drawRect(var7, var8, 303, 33);
+                var5.fillRect(var7 + 2, 2 + var8, 3 * var4, 30);
+                var5.setColor(Color.black);
+                var5.drawRect(1 + var7, var8 - -1, 301, 31);
+                var5.fillRect(3 * var4 + (var7 - -2), 2 + var8, 300 - var4 * 3, 30);
+                var5.setFont(TextCore.Helvetica);
+                var5.setColor(Color.white);
+                var3.drawString(var5, 22 + var8, var7 + (-var3.method1575(aFontMetrics1822) + 304) / 2);
+            }
+
+            if (Class167.aClass94_2083 != null) {
+                var5.setFont(TextCore.Helvetica);
+                var5.setColor(Color.white);
+                Class167.aClass94_2083.drawString(var5, Class140_Sub7.canvasHeight / 2 - 26, Class23.canvasWidth / 2 - Class167.aClass94_2083.method1575(aFontMetrics1822) / 2);
+            }
+
+        } catch (Exception var10) {
+            GameShell.canvas.repaint();
+        }
+    }
+}